rpms/gpac/EL-6 gpac-0.5.0-libdir.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 gpac-snapshot.sh, 1.1, 1.2 gpac.spec, 1.30, 1.31 sources, 1.6, 1.7 gpac-0.4.6-ffmpeg.patch, 1.3, NONE gpac-0.4.6-js_cflags.patch, 1.1, NONE gpac-0.4.6-makefix.patch, 1.2, NONE gpac-0.4.6-noldflag.patch, 1.1, NONE gpac-0.4.6-osmo.patch, 1.1, NONE gpac-0.4.6-soname.patch, 1.1, NONE

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/free/rpms/gpac/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26927/EL-6

Modified Files:
	.cvsignore gpac-snapshot.sh gpac.spec sources 
Added Files:
	gpac-0.5.0-libdir.patch 
Removed Files:
	gpac-0.4.6-ffmpeg.patch gpac-0.4.6-js_cflags.patch 
	gpac-0.4.6-makefix.patch gpac-0.4.6-noldflag.patch 
	gpac-0.4.6-osmo.patch gpac-0.4.6-soname.patch 
Log Message:
Update to 0.5.0


gpac-0.5.0-libdir.patch:
 configure |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gpac-0.5.0-libdir.patch ---
diff -up gpac/configure.libdir gpac/configure
--- gpac/configure.libdir	2012-06-23 17:35:19.000000000 +0200
+++ gpac/configure	2012-06-23 19:12:16.815152617 +0200
@@ -2932,7 +2932,7 @@ echo '	$(CC) $(CFLAGS) $(PIC_CFLAGS) -c
 #pkg-config
 echo "prefix=$prefix"				 > gpac.pc
 echo "exec_prefix=\${prefix}"			>> gpac.pc
-echo "libdir=\${exec_prefix}/lib"		>> gpac.pc
+echo "libdir=\${exec_prefix}/$libdir"		>> gpac.pc
 echo "includedir=\${exec_prefix}/include"	>> gpac.pc
 echo ""						>> gpac.pc
 echo "Name: gpac"				>> gpac.pc


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gpac/EL-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	29 May 2010 14:10:47 -0000	1.6
+++ .cvsignore	4 Jul 2012 11:44:22 -0000	1.7
@@ -1 +1 @@
-gpac-20100527.tar.bz2
+gpac-0.5.0.tar.gz


Index: gpac-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/gpac/EL-6/gpac-snapshot.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gpac-snapshot.sh	3 Aug 2008 14:29:51 -0000	1.1
+++ gpac-snapshot.sh	4 Jul 2012 11:44:22 -0000	1.2
@@ -12,12 +12,13 @@
 
 unset CDPATH
 pwd=$(pwd)
-cvs=$(date +%Y%m%d)
+svn=$(date +%Y%m%d)
 
 cd "$tmp"
-cvs -z3 -d:pserver:anonymous at gpac.cvs.sourceforge.net:/cvsroot/gpac co -P gpac 
-find . -type d -name CVS -print0 | xargs -0r rm -rf
-chmod 755 gpac/configure
+svn co http://gpac.svn.sourceforge.net/svnroot/gpac/trunk/gpac gpac
+revision=$(svnversion gpac)
+echo "#define GPAC_SVN_REVISION	\"$revision\"" > gpac/include/gpac/version.h
+find gpac -name '.svn' -type d  -exec rm -rf {} ';' || :
 rm -rf gpac/extra_lib/
-tar jcf "$pwd"/gpac-$cvs.tar.bz2 gpac
+tar jcf "$pwd"/gpac-$svn.tar.bz2 gpac
 cd - >/dev/null


Index: gpac.spec
===================================================================
RCS file: /cvs/free/rpms/gpac/EL-6/gpac.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- gpac.spec	4 Jan 2012 22:12:46 -0000	1.30
+++ gpac.spec	4 Jul 2012 11:44:22 -0000	1.31
@@ -7,7 +7,7 @@
 #        - Fix unused-direct-shlib-dependency on libgpac
 
 %global osmo          Osmo4
-%global cvs           20100527
+#global svn           20120623
 # Mozilla stuff fails. It's completely disabled for now.
 %global mozver        3.0
 %global geckover      2.0.0
@@ -16,23 +16,15 @@
 
 Name:        gpac
 Summary:     MPEG-4 multimedia framework
-Version:     0.4.6
-Release:     0.13.cvs%{?cvs}%{?dist}.3
+Version:     0.5.0
+Release:     1%{?svn}%{?dist}
 License:     LGPLv2+
 Group:       System Environment/Libraries
 URL:         http://gpac.sourceforge.net/
-#Source0:     http://downloads.sourceforge.net/gpac/gpac-%{version}.tar.gz
-Source0:     http://rpms.kwizart.net/fedora/SOURCE/gpac-%{cvs}.tar.bz2
+Source0:     http://downloads.sourceforge.net/gpac/gpac-%{version}.tar.gz
 Source9:     gpac-snapshot.sh
-#https://sourceforge.net/tracker/?func=detail&atid=571740&aid=2853860&group_id=84101
-Patch0:      gpac-0.4.6-makefix.patch
-Patch1:      gpac-0.4.6-soname.patch
+Patch1:      gpac-0.5.0-libdir.patch
 Patch2:      gpac-0.4.5-amr.patch
-Patch5:      gpac-0.4.6-js_cflags.patch
-#https://sourceforge.net/tracker/?func=detail&atid=571740&aid=2853857&group_id=84101
-Patch9:      gpac-0.4.6-ffmpeg.patch
-Patch11:     gpac-0.4.6-osmo.patch
-Patch12:     gpac-0.4.6-noldflag.patch
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 
 BuildRequires:  ImageMagick
@@ -42,16 +34,16 @@
 BuildRequires:  libGLU-devel
 BuildRequires:  freeglut-devel
 BuildRequires:  freetype-devel >= 2.1.4
-#BuildRequires:  faad2-devel
+BuildRequires:  faad2-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libpng-devel >= 1.2.5
 BuildRequires:  libmad-devel
 BuildRequires:  xvidcore-devel >= 1.0.0
-#BuildRequires:  ffmpeg-devel
+BuildRequires:  ffmpeg-devel
 BuildRequires:  js-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  openssl-devel
-#BuildRequires:  openjpeg-devel
+BuildRequires:  openjpeg-devel
 BuildRequires:  pulseaudio-libs-devel
 BuildRequires:  zlib-devel
 BuildRequires:  libogg-devel libvorbis-devel libtheora-devel
@@ -59,7 +51,7 @@
 BuildRequires:  libXpm-devel
 BuildRequires:  libXv-devel
 BuildRequires:  wxGTK-devel
-#BuildRequires:  xmlrpc-c-devel
+BuildRequires:  xmlrpc-c-devel
 %{?_with_mozilla:BuildRequires: gecko-devel}
 BuildRequires:  doxygen
 BuildRequires:  desktop-file-utils
@@ -148,18 +140,8 @@
 
 %prep
 %setup -q -n gpac
-%patch0 -p1 -b .makefix
-%patch1 -p1 -b .soname
+%patch1 -p1 -b .libdir
 %patch2 -p1 -b .amr
-%patch5 -p1 -b .jscflags
-%patch9 -p1 -b .ffmpeg
-%patch11 -p1 -b .osmo
-%patch12 -p1 -b .noldflag
-
-## kwizart - enable dynamic mode - hardcoded with patch2
-# define SONAME number from the first number of gpac version.
-#define soname libgpac.so.0
-#sed -i.soname -e 's|EXTRALIBS+=$(GPAC_SH_FLAGS)|EXTRALIBS+=$(GPAC_SH_FLAGS)\nLDFLAGS+="-Wl,-soname,%{soname}"|' src/Makefile
 
 # Fix encoding warnings
 cp -p Changelog Changelog.origine
@@ -176,12 +158,17 @@
 %build
 %configure \
   --enable-debug \
-  --X11-path=%{_prefix} \
   --extra-cflags="$RPM_OPT_FLAGS -fPIC -DPIC -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -D_GNU_SOURCE=1" \
+  --X11-path=%{_prefix} \
+  --libdir=%{_lib} \
   --disable-oss-audio \
 %{?_with_mozilla:--mozdir=%{_libdir}/mozilla/plugins} \
 %{?_with_amr:--enable-amr} \
-  --disable-static
+  --disable-static \
+  --use-js=no
+
+#Avoid mess with setup.h
+cp -p config.h include/gpac
 
 ##
 ## Osmo-zila plugin.
@@ -224,7 +211,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install install-lib
+make DESTDIR=$RPM_BUILD_ROOT install install-lib INSTFLAGS="-p"
 
 %{?_with_mozilla:
 ## kwizart - Install osmozilla plugin - make instmoz disabled.
@@ -262,12 +249,9 @@
 rm -rf $RPM_BUILD_ROOT%{_bindir}/%{osmo}
 }
 
-## kwizart - rpmlint gpac no-ldconfig-symlink
-ln -sf  libgpac.so.%{version}-DEV $RPM_BUILD_ROOT%{_libdir}/libgpac.so.0
-ln -sf  libgpac.so.0 $RPM_BUILD_ROOT%{_libdir}/libgpac.so
-
 #Install generated sggen binaries
-for b in MPEG4 SVG X3D; do
+#for b in MPEG4 SVG X3D; do
+for b in MPEG4 X3D; do
   pushd applications/generators/${b}
     install -pm 0755 ${b}Gen $RPM_BUILD_ROOT%{_bindir}
   popd
@@ -277,7 +261,12 @@
 touch -r Changelog doc/html/*
 
 #config.h like but not only
-touch -r Changelog $RPM_BUILD_ROOT%{_includedir}/gpac/configuration.h
+#Usual multilib bug https://bugzilla.rpmfusion.org/show_bug.cgi?id=270
+sed -i -e '/GPAC_CONFIGURATION/d' $RPM_BUILD_ROOT%{_includedir}/gpac/configuration.h
+touch -r Changelog $RPM_BUILD_ROOT%{_includedir}/gpac/*.h
+touch -r Changelog $RPM_BUILD_ROOT%{_includedir}/gpac/internal/*.h
+touch -r Changelog $RPM_BUILD_ROOT%{_includedir}/gpac/modules/*.h
+rm $RPM_BUILD_ROOT%{_includedir}/gpac/config.h
 
 
 %clean
@@ -294,7 +283,7 @@
 %{_bindir}/MP4Box
 %{_bindir}/MP4Client
 %{_bindir}/MPEG4Gen
-%{_bindir}/SVGGen
+#{_bindir}/SVGGen
 %{_bindir}/X3DGen
 %{_datadir}/gpac/
 %{_mandir}/man1/*.1.*
@@ -336,6 +325,28 @@
 
 
 %changelog
+* Sat Jun 23 2012 Nicolas Chauvet <kwizart at gmail.com> - 0.5.0-1
+- Update to 0.5.0
+
+* Wed Feb 22 2012 Nicolas Chauvet <kwizart at gmail.com> - 0.4.6-0.19.svn20110923
+- Rebuilt for x264/FFmpeg
+
+* Wed Jan 25 2012 Nicolas Chauvet <kwizart at gmail.com> - 0.4.6-0.18.svn20110923
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Mon Oct 03 2011 Nicolas Chauvet <kwizart at gmail.com> - 0.4.6-0.17.svn20110923
+- Update gpac-soname.patch
+
+* Fri Sep 23 2011 Nicolas Chauvet <kwizart at gmail.com> - 0.4.6-0.16svn20110923
+- Update to 20110923
+- Fix svnversion
+
+* Thu Sep 22 2011 Nicolas Chauvet <kwizart at gmail.com> - 0.4.6-0.15svn20110915
+- Update to 20110915
+
+* Thu Jul 14 2011 Nicolas Chauvet <kwizart at gmail.com> - 0.4.6-0.14.cvs20100527
+- Rebuild
+
 * Sun Jun 05 2011 Nicolas Chauvet <kwizart at gmail.com> - 0.4.6-0.13.cvs20100527
 - Rebuild for js update
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/gpac/EL-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 May 2010 14:10:47 -0000	1.6
+++ sources	4 Jul 2012 11:44:22 -0000	1.7
@@ -1 +1 @@
-4f715901107857505334dbf9e5975f4c  gpac-20100527.tar.bz2
+19f7bb7c16913c22bdd453db1e653ca0  gpac-0.5.0.tar.gz


--- gpac-0.4.6-ffmpeg.patch DELETED ---


--- gpac-0.4.6-js_cflags.patch DELETED ---


--- gpac-0.4.6-makefix.patch DELETED ---


--- gpac-0.4.6-noldflag.patch DELETED ---


--- gpac-0.4.6-osmo.patch DELETED ---


--- gpac-0.4.6-soname.patch DELETED ---