rpms/dvdstyler/devel dvdstyler-wxVillaLib-libjpeg.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 dvdstyler.spec, 1.11, 1.12 sources, 1.8, 1.9

[Stewart Adam]

Author: firewing

Update of /cvs/free/rpms/dvdstyler/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15960/devel

Modified Files:
	.cvsignore dvdstyler.spec sources 
Added Files:
	dvdstyler-wxVillaLib-libjpeg.patch 
Log Message:
* Mon May 2 2011 Stewart Adam <s.adam at diffingo.com> - 1:1.8.3-1
- Update to 1.8.3
- Port changes from F-14 branch


dvdstyler-wxVillaLib-libjpeg.patch:
 Makefile.am |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE dvdstyler-wxVillaLib-libjpeg.patch ---
--- src/Makefile.am.orig	2010-05-03 02:06:41.000000000 -0400
+++ src/Makefile.am	2010-11-20 18:07:52.380692993 -0500
@@ -9,6 +9,7 @@
 
 AM_CXXFLAGS = @CXXFLAGS@ -I..
 LDADD = ../wxVillaLib/libwxvilla.a
+AM_LDFLAGS = @LDFLAGS@ -ljpeg
 
 EXTRA_DIST = dvdvml.l dvdvmy.y
 MAINTAINERCLEANFILES = dvdvml.c dvdvmy.c dvdvmy.h



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	24 Oct 2009 04:53:15 -0000	1.7
+++ .cvsignore	2 May 2011 07:20:36 -0000	1.8
@@ -1 +1 @@
-DVDStyler-1.7.4.tar.bz2
+DVDStyler-1.8.3.tar.bz2


Index: dvdstyler.spec
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/devel/dvdstyler.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- dvdstyler.spec	24 Oct 2009 04:53:15 -0000	1.11
+++ dvdstyler.spec	2 May 2011 07:20:36 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           dvdstyler
 Epoch:          1
-Version:        1.7.4
+Version:        1.8.3
 Release:        1%{?dist}
 Summary:        Cross-platform DVD authoring application
 
@@ -9,39 +9,37 @@
 URL:            http://www.dvdstyler.de/
 Source0:        http://downloads.sourceforge.net/dvdstyler/DVDStyler-%{version}.tar.bz2
 Patch0:         dvdstyler-make-desktopfile-valid.patch
-# Patch from http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/media-video/dvdstyler/files/dvdstyler-1.7.4-autoconf.patch?rev=1.1
-# Fixes translation compile issue
-Patch1:         dvdstyler-1.7.4-autoconf.patch
+Patch1:         dvdstyler-wxVillaLib-libjpeg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # build
-BuildRequires:  automake, autoconf, gettext
+BuildRequires:  automake, autoconf
+BuildRequires:  gettext
+BuildRequires:  byacc
 # libraries
 BuildRequires:  wxGTK-devel >= 2.6.3
 BuildRequires:  wxsvg-devel >= 1.0-6
 BuildRequires:  ffmpeg-devel
 BuildRequires:  libgnomeui-devel
-BuildRequires:  zip
 # mpeg
-BuildRequires:  mpgtx
-BuildRequires:  mjpegtools
 BuildRequires:  dvdauthor
 # iso/burn
+BuildRequires:  libudev-devel
 BuildRequires:  mkisofs
 BuildRequires:  dvd+rw-tools
 #images
 BuildRequires:  libjpeg-devel
 BuildRequires:  libexif-devel
-BuildRequires:  netpbm-progs
-# finally
-BuildRequires:  desktop-file-utils
+# documentation
+BuildRequires:  zip
 BuildRequires:  xmlto
 
+BuildRequires:  desktop-file-utils
+
 Requires:       dvd+rw-tools
 Requires:       dvdauthor
 Requires:       mjpegtools
 Requires:       mkisofs
 Requires:       mpgtx
-Requires:       netpbm-progs
 Requires:       wxsvg >= 1.0-6
 # note: do not add Require: totem-backend or another DVD player - see
 # RPM Fusion bug 366 for more details
@@ -55,11 +53,11 @@
 %prep
 %setup -q -n DVDStyler-%{version}
 %patch0 -b .validdesktop
-%patch1 -p0 -b .autoconf
+%patch1 -b .libjpeg
 %{__sed} -i 's|_T("xine \\"dvd:/$DIR\\"");|_T("totem \\"dvd://$DIR\\"");|' src/Config.h
 
 %build
-#./autogen.sh
+./autogen.sh
 %configure \
   --disable-dependency-tracking
 # docs folder is not smp_mflags safe
@@ -95,6 +93,10 @@
 %{_mandir}/*/*.gz
 
 %changelog
+* Mon May 2 2011 Stewart Adam <s.adam at diffingo.com> - 1:1.8.3-1
+- Update to 1.8.3
+- Port changes from F-14 branch
+
 * Sat Oct 24 2009 Stewart Adam <s.adam at diffingo.com> - 1:1.7.4-1
 - Update to 1.7.4
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	24 Oct 2009 04:53:15 -0000	1.8
+++ sources	2 May 2011 07:20:36 -0000	1.9
@@ -1 +1 @@
-874972691bd342caf6b1415625816d1d  DVDStyler-1.7.4.tar.bz2
+69a6d0a920e780bbcf65e94041e58429  DVDStyler-1.8.3.tar.bz2