August 2008 - rpmfusion-commits

rpms/libdca/devel libdca-0.0.5-relsymlinks.patch, NONE, 1.1 libdca-0.0.5-strict-aliasing.patch, NONE, 1.1 libdca.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

by Thorsten Leemhuis

Author: thl Update of /cvs/free/rpms/libdca/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv22190 Modified Files: .cvsignore sources Added Files: libdca-0.0.5-relsymlinks.patch libdca-0.0.5-strict-aliasing.patch libdca.spec Log Message: initial import from livna libdca-0.0.5-relsymlinks.patch: --- NEW FILE libdca-0.0.5-relsymlinks.patch --- diff -Naupr libdca-0.0.5.orig/libdca/Makefile.am libdca-0.0.5/libdca/Makefile.am --- libdca-0.0.5/libdca/Makefile.am 2007-04-08 10:32:01.000000000 +0200 +++ libdca-0.0.5/libdca/Makefile.am 2007-04-08 10:32:01.000000000 +0200 @@ -14,7 +14,7 @@ pkgconfig_DATA = libdca.pc libdts.pc EXTRA_DIST = configure.incl install-exec-hook: - ln -sf "$(libdir)/libdca.a" "$(DESTDIR)$(libdir)/libdts.a" + [ -f "$(DESTDIR)$(libdir)/libdca.a" ] && ln -sf "libdca.a" "$(DESTDIR)$(libdir)/libdts.a" || true uninstall-hook: - unlink "$(DESTDIR)$(libdir)/libdts.a" + [ -f "$(DESTDIR)$(libdir)/libdca.a" ] && unlink "$(DESTDIR)$(libdir)/libdts.a" || true diff -Naupr libdca-0.0.5.orig/libdca/Makefile.in libdca-0.0.5/libdca/Makefile.in --- libdca-0.0.5/libdca/Makefile.in 2007-04-10 14:31:23.000000000 +0200 +++ libdca-0.0.5/libdca/Makefile.in 2007-04-10 14:31:23.000000000 +0200 @@ -504,10 +504,10 @@ uninstall-am: uninstall-libLTLIBRARIES u install-exec-hook: - ln -sf "$(libdir)/libdca.a" "$(DESTDIR)$(libdir)/libdts.a" + [ -f "$(DESTDIR)$(libdir)/libdca.a" ] && ln -sf "libdca.a" "$(DESTDIR)$(libdir)/libdts.a" || true uninstall-hook: - unlink "$(DESTDIR)$(libdir)/libdts.a" + [ -f "$(DESTDIR)$(libdir)/libdca.a" ] && unlink "$(DESTDIR)$(libdir)/libdts.a" || true # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Naupr libdca-0.0.5.orig/src/Makefile.am libdca-0.0.5/src/Makefile.am --- libdca-0.0.5/src/Makefile.am 2007-04-08 10:21:18.000000000 +0200 +++ libdca-0.0.5/src/Makefile.am 2007-04-08 10:21:18.000000000 +0200 @@ -24,7 +24,7 @@ install-data-hook: for a in dcadec extract_dca; do \ oldname=`echo "$$a" | sed -e 's/ca/ts/' | sed '$(transform)'` ; \ name=`echo "$$a" | sed '$(transform)'` ; \ - ln -sf "$(man1dir)/$${name}.1" "$(DESTDIR)$(man1dir)/$${oldname}.1" ; \ + ln -sf "$${name}.1" "$(DESTDIR)$(man1dir)/$${oldname}.1" ; \ done uninstall-hook: diff -Naupr libdca-0.0.5.orig/src/Makefile.in libdca-0.0.5/src/Makefile.in --- libdca-0.0.5/src/Makefile.in 2007-04-10 14:31:23.000000000 +0200 +++ libdca-0.0.5/src/Makefile.in 2007-04-10 14:31:23.000000000 +0200 @@ -562,7 +562,7 @@ install-data-hook: for a in dcadec extract_dca; do \ oldname=`echo "$$a" | sed -e 's/ca/ts/' | sed '$(transform)'` ; \ name=`echo "$$a" | sed '$(transform)'` ; \ - ln -sf "$(man1dir)/$${name}.1" "$(DESTDIR)$(man1dir)/$${oldname}.1" ; \ + ln -sf "$${name}.1" "$(DESTDIR)$(man1dir)/$${oldname}.1" ; \ done uninstall-hook: libdca-0.0.5-strict-aliasing.patch: --- NEW FILE libdca-0.0.5-strict-aliasing.patch --- diff -up libdca-0.0.5/libao/Makefile.in.aliasing libdca-0.0.5/libao/Makefile.in --- libdca-0.0.5/libao/Makefile.in.aliasing 2007-11-02 21:16:15.000000000 +0100 +++ libdca-0.0.5/libao/Makefile.in 2007-11-02 21:16:46.000000000 +0100 @@ -172,7 +172,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -AM_CFLAGS = $(OPT_CFLAGS) +AM_CFLAGS = $(OPT_CFLAGS) -fno-strict-aliasing AM_CPPFLAGS = -I$(top_srcdir)/include noinst_LTLIBRARIES = libao.la libao_la_SOURCES = audio_out.c audio_out_null.c audio_out_float.c \ diff -up libdca-0.0.5/libao/Makefile.am.aliasing libdca-0.0.5/libao/Makefile.am --- libdca-0.0.5/libao/Makefile.am.aliasing 2007-04-08 10:23:11.000000000 +0200 +++ libdca-0.0.5/libao/Makefile.am 2007-11-02 21:16:08.000000000 +0100 @@ -1,4 +1,4 @@ -AM_CFLAGS = $(OPT_CFLAGS) +AM_CFLAGS = $(OPT_CFLAGS) -fno-strict-aliasing AM_CPPFLAGS = -I$(top_srcdir)/include noinst_LTLIBRARIES = libao.la diff -up libdca-0.0.5/libdca/bitstream.h.aliasing libdca-0.0.5/libdca/bitstream.h --- libdca-0.0.5/libdca/bitstream.h.aliasing 2007-04-08 11:08:35.000000000 +0200 +++ libdca-0.0.5/libdca/bitstream.h 2007-11-02 21:20:07.000000000 +0100 @@ -29,22 +29,38 @@ #else -# define swab32(x)\ -((((uint8_t*)&x)[0] << 24) | (((uint8_t*)&x)[1] << 16) | \ - (((uint8_t*)&x)[2] << 8) | (((uint8_t*)&x)[3])) +static inline uint32_t swab32(uint32_t x) { + union { + uint32_t x32; + uint8_t x8[4]; + } u; + u.x32 = x; + return u.x8[0] << 24 | u.x8[1] << 16 | u.x8[2] << 8 | u.x8[3]; +} #endif #ifdef WORDS_BIGENDIAN -# define swable32(x)\ -((((uint8_t*)&x)[0] << 16) | (((uint8_t*)&x)[1] << 24) | \ - (((uint8_t*)&x)[2]) | (((uint8_t*)&x)[3] << 8)) +static inline uint32_t swable32(uint32_t x) { + union { + uint32_t x32; + uint8_t x8[4]; + } u; + u.x32 = x; + return u.x8[0] << 16 | u.x8[1] << 24 | u.x8[2] | u.x8[3] << 8; +} #else -# define swable32(x)\ -((((uint32_t)x) >> 16) | (((uint32_t)x) << 16)) +static inline uint32_t swable32(uint32_t x) { + union { + uint32_t x32; + uint16_t x16[2]; + } u; + u.x32 = x; + return u.x16[0] << 16 | u.x16[1]; +} #endif ***** Error reading new file: [Errno 2] No such file or directory: 'libdca.spec' Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/libdca/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 16:52:34 -0000 1.1 +++ .cvsignore 3 Aug 2008 14:38:57 -0000 1.2 @@ -0,0 +1 @@ +libdca-0.0.5.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/libdca/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:52:34 -0000 1.1 +++ sources 3 Aug 2008 14:38:57 -0000 1.2 @@ -0,0 +1 @@ +dab6b2795c66a82a6fcd4f8343343021 libdca-0.0.5.tar.bz2

16 years, 3 months

1
0
0 / 0

rpms/lame/devel lame-as-needed.patch, NONE, 1.1 lame-noexecstack.patch, NONE, 1.1 lame.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

by Thorsten Leemhuis

Author: thl Update of /cvs/free/rpms/lame/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv21955 Modified Files: .cvsignore sources Added Files: lame-as-needed.patch lame-noexecstack.patch lame.spec Log Message: initial import from livna lame-as-needed.patch: --- NEW FILE lame-as-needed.patch --- --- lame-3.97/libmp3lame/Makefile.am.no_undefined 2005-08-21 12:32:09.000000000 -0500 +++ lame-3.97/libmp3lame/Makefile.am 2006-10-20 12:06:51.000000000 -0500 @@ -18,7 +18,7 @@ decoder_ldadd = endif -libmp3lame_la_LIBADD = $(nasm_ldadd) $(decoder_ldadd) +libmp3lame_la_LIBADD = $(nasm_ldadd) $(decoder_ldadd) @CONFIG_MATH_LIB@ libmp3lame_la_LDFLAGS = -version-info @LIB_MAJOR_VERSION@:@LIB_MINOR_VERSION@ \ -no-undefined --- lame-3.97/configure.in.no_undefined 2006-09-24 08:53:31.000000000 -0500 +++ lame-3.97/configure.in 2006-10-20 12:07:15.000000000 -0500 @@ -1059,8 +1059,9 @@ CFLAGS="${OPTIMIZATION} ${CFLAGS}" LDADD="${LDADD}" -FRONTEND_LDADD="${FRONTEND_LDADD} ${CONFIG_MATH_LIB}" +FRONTEND_LDADD="${FRONTEND_LDADD}" +AC_SUBST(CONFIG_MATH_LIB) AC_SUBST(INCLUDES) lame-noexecstack.patch: --- NEW FILE lame-noexecstack.patch --- diff -ur lame-3.97.orig/libmp3lame/i386/choose_table.nas lame-3.97/libmp3lame/i386/choose_table.nas --- lame-3.97.orig/libmp3lame/i386/choose_table.nas 2000-10-27 13:19:05.000000000 +0200 +++ lame-3.97/libmp3lame/i386/choose_table.nas 2007-02-15 09:14:07.000000000 +0100 @@ -431,3 +431,7 @@ ret end + +%ifidn __OUTPUT_FORMAT__,elf +section .note.GNU-stack noalloc noexec nowrite progbits +%endif diff -ur lame-3.97.orig/libmp3lame/i386/cpu_feat.nas lame-3.97/libmp3lame/i386/cpu_feat.nas --- lame-3.97.orig/libmp3lame/i386/cpu_feat.nas 2003-11-10 16:41:00.000000000 +0100 +++ lame-3.97/libmp3lame/i386/cpu_feat.nas 2007-02-15 09:13:58.000000000 +0100 @@ -105,3 +105,7 @@ ret end + +%ifidn __OUTPUT_FORMAT__,elf +section .note.GNU-stack noalloc noexec nowrite progbits +%endif diff -ur lame-3.97.orig/libmp3lame/i386/fft.nas lame-3.97/libmp3lame/i386/fft.nas --- lame-3.97.orig/libmp3lame/i386/fft.nas 2000-10-04 14:13:26.000000000 +0200 +++ lame-3.97/libmp3lame/i386/fft.nas 2007-02-15 09:14:34.000000000 +0100 @@ -265,3 +265,7 @@ pop esi pop ebx ret + +%ifidn __OUTPUT_FORMAT__,elf +section .note.GNU-stack noalloc noexec nowrite progbits +%endif diff -ur lame-3.97.orig/libmp3lame/i386/fft3dn.nas lame-3.97/libmp3lame/i386/fft3dn.nas --- lame-3.97.orig/libmp3lame/i386/fft3dn.nas 2006-09-24 15:53:33.000000000 +0200 +++ lame-3.97/libmp3lame/i386/fft3dn.nas 2007-02-15 09:14:18.000000000 +0100 @@ -275,3 +275,7 @@ add esp,16 popd ebp, ebx, esi, edi endproc + +%ifidn __OUTPUT_FORMAT__,elf +section .note.GNU-stack noalloc noexec nowrite progbits +%endif diff -ur lame-3.97.orig/libmp3lame/i386/fftfpu.nas lame-3.97/libmp3lame/i386/fftfpu.nas --- lame-3.97.orig/libmp3lame/i386/fftfpu.nas 2000-10-04 14:13:26.000000000 +0200 +++ lame-3.97/libmp3lame/i386/fftfpu.nas 2007-02-15 09:14:35.000000000 +0100 @@ -617,3 +617,7 @@ endproc end + +%ifidn __OUTPUT_FORMAT__,elf +section .note.GNU-stack noalloc noexec nowrite progbits +%endif diff -ur lame-3.97.orig/libmp3lame/i386/fftsse.nas lame-3.97/libmp3lame/i386/fftsse.nas --- lame-3.97.orig/libmp3lame/i386/fftsse.nas 2000-10-04 14:13:26.000000000 +0200 +++ lame-3.97/libmp3lame/i386/fftsse.nas 2007-02-15 09:14:36.000000000 +0100 @@ -536,3 +536,7 @@ end + +%ifidn __OUTPUT_FORMAT__,elf +section .note.GNU-stack noalloc noexec nowrite progbits +%endif diff -ur lame-3.97.orig/libmp3lame/i386/ffttbl.nas lame-3.97/libmp3lame/i386/ffttbl.nas --- lame-3.97.orig/libmp3lame/i386/ffttbl.nas 2000-10-04 14:13:26.000000000 +0200 +++ lame-3.97/libmp3lame/i386/ffttbl.nas 2007-02-15 09:14:38.000000000 +0100 @@ -76,3 +76,7 @@ segment_code end + +%ifidn __OUTPUT_FORMAT__,elf +section .note.GNU-stack noalloc noexec nowrite progbits +%endif --- NEW FILE lame.spec --- Name: lame Version: 3.97 Release: 7%{?dist} Summary: Free MP3 audio compressor Group: Applications/Multimedia License: GPLv2+ URL: http://lame.sourceforge.net/ Source0: http://downloads.sourceforge.net/lame/%{name}-%{version}.tar.gz Patch0: %{name}-as-needed.patch Patch1: %{name}-noexecstack.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool BuildRequires: ncurses-devel BuildRequires: gtk+-devel # pkg-config should be pulled in by gtk+-devel but is not in EL-5 BuildRequires: pkgconfig %ifarch %{ix86} BuildRequires: nasm BuildRequires: gcc >= 3.2 %endif Requires: ncurses >= 5.0 Requires: %{name}-libs = %{version}-%{release} %description LAME is an open source MP3 encoder whose quality and speed matches commercial encoders. LAME handles MPEG1,2 and 2.5 layer III encoding with both constant and variable bitrates. %package libs Summary: LAME MP3 encoding library Group: System Environment/Libraries %description libs LAME MP3 encoding library. %package devel Summary: Development files for %{name} Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} %description devel This package development files for %{name}. %package mp3x Summary: MP3 frame analyzer Group: Applications/Multimedia Requires: %{name} = %{version}-%{release} %description mp3x This package contains the mp3x frame analyzer. %prep %setup -q %patch0 -p1 -b .as-needed %patch1 -p1 -b .noexec iconv -f ISO-8859-1 -t UTF8 ChangeLog > ChangeLog.tmp && mv ChangeLog.tmp ChangeLog %build autoreconf sed -i -e 's/^$\s*hardcode_libdir_flag_spec\s*=$.*/\1/' configure %ifarch %{ix86} export CFLAGS="$RPM_OPT_FLAGS -ffast-math" %endif %configure \ --disable-dependency-tracking \ --disable-static \ %ifarch %{ix86} --enable-nasm \ %endif --enable-mp3x \ --enable-mp3rtp \ --enable-decode-layer1 make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_libdir}/*.la # Some apps still expect to find <lame.h> ln -sf lame/lame.h $RPM_BUILD_ROOT%{_includedir}/lame.h rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name} %check make test %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig %clean rm -rf $RPM_BUILD_ROOT %files %defattr (-,root,root,-) %doc README TODO USAGE doc/html/*.html doc/html/*.css %{_bindir}/lame %{_bindir}/mp3rtp %{_mandir}/man1/lame.1* %files libs %defattr(-,root,root,-) %doc ChangeLog COPYING LICENSE %{_libdir}/libmp3lame.so.* %files devel %defattr (-,root,root,-) %doc API HACKING STYLEGUIDE %{_libdir}/libmp3lame.so %{_includedir}/lame/ %{_includedir}/lame.h %files mp3x %defattr (-,root,root,-) %{_bindir}/mp3x %changelog * Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 3.97-7 - rebuild * Thu Oct 4 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> - 3.97-6 - Merge freshrpms spec into livna spec for rpmfusion: - Set release to 6 to be higher as both livna and freshrpms latest release - Update license tag for new license tag guidelines - Add --enable-decode-layer1 to configure flags - Make Source0 the advised sf.net download url - Make ChangeLog UTF-8 - Don't duplicate the COPYING ChangeLog and LICENSE docs betweent the main and the -libs package * Fri Sep 21 2007 Ville Skyttä <ville.skytta at iki.fi> - 3.97-5 - BuildRequire pkgconfig for gtk+-devel in EL-5. * Sun Mar 11 2007 Dominik Mierzejewski <rpm at greysector.net> - 3.97-4 - fix rpaths and SELinux noexec stack issue (patch by Hans de Goede) * Wed Nov 01 2006 Dominik Mierzejewski <rpm at greysector.net> - 3.97-3 - fix FC6+ binutils issues (patch by Rex Dieter) * Thu Sep 28 2006 Dominik Mierzejewski <rpm at greysector.net> - 3.97-2 - Split off -libs subpackage - Reenable parallel make * Sun Sep 24 2006 Ville Skyttä <ville.skytta at iki.fi> - 3.97-1 - 3.97, 3DNow! asm patch applied upstream. * Wed Sep 20 2006 Ville Skyttä <ville.skytta at iki.fi> - 3.96.1-7 - Avoid rpaths (from Ubuntu). - Don't ship static libraries. - Drop unneeded zero epochs. - Build with dependency tracking disabled. - Prune pre-2003 changelog entries. - Other specfile cleanups. * Sun May 14 2006 Noa Resare <noa(a)resare.com> 3.96.1-6 - Adding a patch to fix the 3DNow! asm and re-enable it * Fri Apr 7 2006 Dams <anvil[AT]livna.org> - 3.96.1-5 - Disabling nasm for now. (bug #892) * Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - switch to new release field * Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - add dist * Tue Dec 27 2005 Thorsten Leemhuis <fedora[at]leemhuis.info> 3.96.1-0.lvn.4 - add defattr to files of mp3x subpackage * Tue Dec 27 2005 Thorsten Leemhuis <fedora[at]leemhuis.info> 3.96.1-0.lvn.3 - Drop Epoch * Sat Sep 17 2005 W. Michael Petullo <mike[at]flyn.org> - 0:3.96.1-0.lvn.2 - Split mp3x into its own package to remove general gtk+ requirement. * Sun Jul 25 2004 Marius L. Jøhndal <mariuslj at ifi.uio.no> - 0:3.96.1-0.lvn.1 - Updated to 3.96.1. * Thu Apr 15 2004 Marius L. Jøhndal <mariuslj at ifi.uio.no> - 0:3.96-0.lvn.1 - Updated to 3.96. * Tue Jan 27 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:3.95.1-0.lvn.3 - Enable mp3x and mp3rtp. - Run tests in the %%check section. - Use "make install DESTDIR=..." instead of %%makeinstall. - s/fdr/lvn/ in release tag. * Tue Jan 27 2004 Marius L. Jøhndal <mariuslj at ifi.uio.no> 0:3.95.1-0.fdr.2 - Disabled parallel make (#61). * Sat Jan 17 2004 Marius L. Jøhndal <mariuslj at ifi.uio.no> 0:3.95.1-0.fdr.1 - Updated to 3.95.1. - Spec file edited to match current Fedora template. - Re-wrote descriptions. - Converted spec file to UTF-8. * Sat Aug 16 2003 Marius L. Jøhndal <mariuslj at ifi.uio.no> 0:3.93.1-0.fdr.8 - Patch configure instead of configure.in to avoid regenerating build files (bug 223). * Mon Jul 21 2003 Marius L. Jøhndal <mariuslj at ifi.uio.no> 0:3.93.1-0.fdr.7 - Rebuild to get source permissions right (bug 223). - Removed Requires: /usr/bin/find (bug 223). * Sat May 10 2003 Marius Jøhndal <mariuslj at ifi.uio.no> 0:3.93.1-0.fdr.6 - Use RPM_BUILD_ROOT and RPM_OPT_FLAGS instead of macros. * Sat May 10 2003 Marius Jøhndal <mariuslj at ifi.uio.no> 0:3.93.1-0.fdr.5 - Backed out Vorbis changes (bug 198, 223). * Fri May 2 2003 Marius Jøhndal <mariuslj at ifi.uio.no> 0:3.93.1-0.fdr.4 - Fixed problems with Makefiles being removed from documentation upon installation. * Fri Apr 25 2003 Marius Jøhndal <mariuslj at ifi.uio.no> 0:3.93.1-0.fdr.3 - Honour %%optflags. - Vorbis support (bug #198). - Added LICENSE to documentation. * Fri Apr 4 2003 Marius Jøhndal <mariuslj at ifi.uio.no> 0:3.93.1-0.fdr.2 - Minor adjustments of optimisation flags and configure settings. - Killed some noise caused by a bad gtk macro. - Added epoch numbers to requires. * Wed Apr 2 2003 Marius Jøhndal <mariuslj at ifi.uio.no> 0:3.93.1-0.fdr.1 - Initial Fedora RPM release. * Mon Mar 31 2003 Matthias Saou <matthias.saou(a)est.une.marmotte.net> - Rebuilt for Red Hat Linux 9. - Exclude .la file. * Mon Jan 13 2003 Matthias Saou <matthias.saou(a)est.une.marmotte.net> - Update to 3.93.1. - Removed Epoch: tag, upgrade by hand! :-/ Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/lame/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 16:52:18 -0000 1.1 +++ .cvsignore 3 Aug 2008 14:36:49 -0000 1.2 @@ -0,0 +1 @@ +lame-3.97.tar.gz Index: sources =================================================================== RCS file: /cvs/free/rpms/lame/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:52:18 -0000 1.1 +++ sources 3 Aug 2008 14:36:49 -0000 1.2 @@ -0,0 +1 @@ +90a4acbb730d150dfe80de145126eef7 lame-3.97.tar.gz

16 years, 3 months

1
0
0 / 0

rpms/kplayer/devel kplayer.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

by Thorsten Leemhuis

Author: thl Update of /cvs/free/rpms/kplayer/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv21874 Modified Files: .cvsignore sources Added Files: kplayer.spec Log Message: initial import from livna --- NEW FILE kplayer.spec --- Name: kplayer Epoch: 1 Version: 0.6.2 Release: 4%{?dist} Summary: A KDE media player based on MPlayer Group: Applications/Multimedia License: GPL URL: http://kplayer.sourceforge.net/ Source0: http://osdn.dl.sourceforge.net/sourceforge/kplayer/kplayer-%{version}.tar... BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: automake BuildRequires: desktop-file-utils BuildRequires: kdelibs-devel Requires: mplayer #Requires(hint): libdvdcss %description KPlayer is a KDE media player based on MPlayer, www.mplayerhq.hu. With KPlayer you can easily play a wide variety of video and audio files and streams using a rich and friendly interface compliant with KDE standards. Features include - video, audio and subtitle playback from file, URL, DVD, VCD, audio CD, TV, DVB, etc., as well as KDE I/O Slaves; - volume, contrast, brightness, hue and saturation controls; - zooming, full screen and fixed aspect options; - status and progress display and seeking; - playlist; - configuration dialog and file specific options; - KPart for integration with Konqueror, KMLDonkey, etc. %prep %setup -q [ ! -f configure ] && \ make -f admin/Makefile.common %build unset QTDIR || : ; . /etc/profile.d/qt.sh %configure \ --disable-rpath \ --enable-new-ldflags \ --disable-debug --disable-warnings \ --disable-dependancy-tracking --disable-final make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT ## File lists # locale's %find_lang %{name} || touch %{name}.lang # HTML (1.0) HTML_DIR=$(kde-config --expandvars --install html) if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do if [ -d $lang_dir ]; then lang=$(basename $lang_dir) echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang # replace absolute symlinks with relative ones pushd $lang_dir for i in *; do [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common done popd fi done fi %check desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop ||: %clean rm -rf $RPM_BUILD_ROOT %post for icon_theme in hicolor locolor ; do touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||: gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||: done update-desktop-database -q %{_datadir}/applications 2>/dev/null || : %postun for icon_theme in hicolor locolor ; do touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||: gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||: done update-desktop-database -q %{_datadir}/applications 2>/dev/null || : %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS BUGS ChangeLog COPYING README TODO %{_bindir}/kplayer %{_datadir}/applications/kde/*kplayer.desktop %{_datadir}/apps/kplayer/ %{_datadir}/apps/konqueror/servicemenus/*.desktop %{_datadir}/icons/hicolor/*/*/* %{_datadir}/icons/locolor/*/*/* %{_datadir}/services/*kplayer*.desktop %{_libdir}/kde3/libkplayerpart.* %changelog * Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1:0.6.2-4 - rebuild * Fri Nov 02 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1:0.6.2-3 - revert to kplayer-0.6.2 (+Epoch), newer releases are gplv3, which is incompatible with qt's gplv2 license. * Fri Oct 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.6.3-1 - kplayer-0.6.3 * Thu May 24 2007 Rex Dieter <rexdieter[AT]users.sf.net> 0.6.2-2 - kplayer-0.6.2 * Sun Mar 04 2007 Rex Dieter <rexdieter[AT]users.sf.net> 0.6.1-2 - kplayer-0.6.1 * Wed Jan 24 2007 Rex Dieter <rexdieter[AT]users.sf.net> 0.6-1 - kplayer-0.6 (#1382) * Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.3-5 - respin * Wed May 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.3-4 - disable kfile_kplayer (#933) - simplify fix for kdelibs conflicts * Thu Mar 16 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.3-3 - drop -desktop patch - cleanup %%lang'ification - cleanup BR's. - .desktop: --add-category="AudioVideo" * Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - switch to new release field - drop Epoch * Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - add dist * Sat Jun 4 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5.3-0.lvn.2 - Fix kdelibs conflict avoidance on FC4 (#459). - Update desktop database and GTK icon cache after (un)installation. - Reduce dir ownership bloat. * Mon Jan 10 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5.3-0.lvn.1 - Update to 0.5.3. * Tue Oct 5 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5.2-0.lvn.1 - Update to 0.5.2. - Disable dependency tracking to speed up the build. * Mon Jul 5 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5.1-0.lvn.1 - Update to 0.5.1. * Sun Jul 4 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5.0-0.lvn.2 - Fix build on Qt 3.1. * Sat Jul 3 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5.0-0.lvn.1 - Update to 0.5.0. - s/fedora/livna/ in desktop entry. * Sun Nov 9 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.0-0.lvn.1 - Update to 0.4.0. * Mon Oct 13 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.3.1-0.fdr.1 - Update to 0.3.1. * Thu Jul 10 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.2.0-0.fdr.1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/kplayer/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 16:52:10 -0000 1.1 +++ .cvsignore 3 Aug 2008 14:36:45 -0000 1.2 @@ -0,0 +1 @@ +kplayer-0.6.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/kplayer/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:52:10 -0000 1.1 +++ sources 3 Aug 2008 14:36:45 -0000 1.2 @@ -0,0 +1 @@ +5bfd1bef05a55f2cac913818e4213d33 kplayer-0.6.2.tar.bz2

16 years, 3 months

1
0
0 / 0

rpms/gsview/devel gsview-4.4-htmlview.patch, NONE, 1.1 gsview-4.7-dllversion.patch, NONE, 1.1 gsview-4.7-letterpaper.patch, NONE, 1.1 gsview-4.8-libgs.patch, NONE, 1.1 gsview.desktop, NONE, 1.1 gsview.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

by Thorsten Leemhuis

Author: thl Update of /cvs/free/rpms/gsview/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv21394 Modified Files: .cvsignore sources Added Files: gsview-4.4-htmlview.patch gsview-4.7-dllversion.patch gsview-4.7-letterpaper.patch gsview-4.8-libgs.patch gsview.desktop gsview.spec Log Message: initial import from livna gsview-4.4-htmlview.patch: --- NEW FILE gsview-4.4-htmlview.patch --- --- gsview-4.4/srcunx/gvxreg.c.htmlview 2001-10-05 03:48:14.000000000 -0500 +++ gsview-4.4/srcunx/gvxreg.c 2003-04-28 11:28:15.000000000 -0500 @@ -76,7 +76,7 @@ { if (debug & DEBUG_GENERAL) gs_addmess("online_reg:\n"); - exec_program("netscape", "http://www.ghostgum.com.au/"); + exec_program("htmlview", "http://www.ghostgum.com.au/"); } void modal_reg(GtkWidget *w, gpointer data) --- gsview-4.4/srcunx/gvxhelp.txt.htmlview 2003-03-14 15:45:52.000000000 -0600 +++ gsview-4.4/srcunx/gvxhelp.txt 2003-04-28 11:29:54.000000000 -0500 @@ -18,11 +18,7 @@ TAG="#$2" fi -if mozilla -remote openFile$file://$1$TAG$ ; then - exit 0 -else - mozilla file://$1$TAG -fi +htmlview $1$TAG exit 0 gsview-4.7-dllversion.patch: --- NEW FILE gsview-4.7-dllversion.patch --- --- gsview-4.7/src/cdll.c.dllversion 2002-02-09 21:46:38.000000000 -0600 +++ gsview-4.7/src/cdll.c 2005-06-23 09:05:39.000000000 -0500 @@ -106,6 +106,10 @@ } dll->revision_number = rv.revision; + /* Hack because FC5's ghostscript-8.15 reports 81500 instead of 815 -- Rex */ + if ( dll->revision_number > (GS_REVISION_MIN*100) ) + dll->revision_number = (long)(dll->revision_number / 100); + if ( (dll->revision_number < GS_REVISION_MIN) || (dll->revision_number > GS_REVISION_MAX) ) { gs_addmessf("\nWrong version of DLL found.\n\ gsview-4.7-letterpaper.patch: --- NEW FILE gsview-4.7-letterpaper.patch --- --- gsview-4.7/src/gvcinit.c.letterpaper 2005-03-01 03:51:38.000000000 -0600 +++ gsview-4.7/src/gvcinit.c 2005-06-23 10:41:42.000000000 -0500 @@ -319,13 +319,13 @@ option.button_show = TRUE; option.fit_page = FALSE; /* Changed after 2.1 */ option.safer = TRUE; - option.media = IDM_A4; - strcpy(option.medianame, "A4"); + option.media = IDM_LETTER; + strcpy(option.medianame, "Letter"); option.media_rotate = FALSE; option.user_width_warn = 5669; /* 2 metres */ option.user_height_warn = 5669; - option.user_width = 595; /* A4 width 210mm */ - option.user_height = 842; /* A4 height 297mm */ + option.user_width = 612; /* Letter width 8.5in */ + option.user_height = 792; /* Letter height 11in */ option.epsf_clip = FALSE; option.epsf_warn = FALSE; option.ignore_dsc = FALSE; gsview-4.8-libgs.patch: --- NEW FILE gsview-4.8-libgs.patch --- --- gsview-4.8/src/gvcver.h.libgs 2006-02-24 05:24:42.000000000 -0600 +++ gsview-4.8/src/gvcver.h 2006-05-07 20:43:57.000000000 -0500 @@ -57,7 +57,7 @@ /* Ghostscript */ #define GS_PRODUCT "AFPL Ghostscript" #define GS_REVISION_MIN 704 -#define GS_REVISION 704 +#define GS_REVISION @@GS_REVISION@@ #define GS_REVISION_MAX 999 #ifdef _Windows @@ -76,7 +76,7 @@ #if X11 #define INIFILE "gsview.ini" #define GS_EXENAME "gs" -#define GS_DLLNAME "libgs.so" +#define GS_DLLNAME "libgs.so.@@SOMAJOR@@" #else #define GS_EXENAME "gsos2.exe" #define GS_DLLNAME "gsdll2.dll" --- NEW FILE gsview.desktop --- [Desktop Entry] Encoding=UTF-8 Name=GSview GenericName=PS/PDF Viewer Comment=EPS,PDF,PS Viewer Exec=gsview Icon=gsview Terminal=false Type=Application MimeType=image/x-eps;application/postscript;application/pdf; Categories=Application;GTK;Graphics;Viewer;Publishing; StartupWMClass=gsview --- NEW FILE gsview.spec --- Summary: PostScript and PDF previewer Name: gsview Version: 4.8 Release: 3%{?dist} License: AFPL Group: Applications/Publishing Source: ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/ghostgum/gsview-%{version}.tar.gz URL: http://www.cs.wisc.edu/~ghost/gsview/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source1: gsview.desktop BuildRequires: gtk+-devel BuildRequires: desktop-file-utils BuildRequires: sed >= 4.0 BuildRequires: ghostscript-devel >= 7.07-15.3 %global gs_ver %(gs --version 2> /dev/null | cut -d. -f-2 ) %global gs_ver1 %(echo %{gs_ver} | cut -d. -f1 ) %if "%{?gs_ver1}" == "7" # See http://www.redhat.com/archives/fedora-devel-list/2004-August/msg00068.html Requires: ghostscript >= 7.07-15.3 %endif ## Use htmlview instead of hard-coded mozilla Patch1: gsview-4.4-htmlview.patch # default to libgs.so.@@SOMAJOR@@ instead of libgs.so Patch2: gsview-4.8-libgs.patch # attempt to allow/use ghostscript-8.15 reported value of 81500. # http://bugzilla.redhat.com/159912 Patch3: gsview-4.7-dllversion.patch # Change Paper default A4 -> Letter Patch4: gsview-4.7-letterpaper.patch %description GSview is a graphical interface for Ghostscript. Ghostscript is an interpreter for the PostScript page description language used by laser printers. For documents following the Adobe PostScript Document Structuring Conventions, GSview allows selected pages to be viewed or printed. %prep %setup -q %patch1 -p1 -b .htmlview # patch2 bits below %patch3 -p1 -b .dllversion %patch4 -p1 -b .letterpaper # Determine GS_REVISION/SOMAJOR and substitute values (see patch2) %patch2 -p1 -b .libgs GS_REVISION=%(echo %{gs_ver} | tr -d '.' ) sed -i -e "s|@@GS_REVISION@@|${GS_REVISION}|g" src/gvcver.h # Sanity check to make sure file exists if [ ! -f "%(ls %{_libdir}/libgs.so.?)" ]; then echo "Error: %{_libdir}/libgs.so.? doesn't exist"; exit 1 fi SOMAJOR=$(basename %{_libdir}/libgs.so.? | sed -e 's@libgs.so.(a)@' ) sed -i -e "s|@@SOMAJOR@@|${SOMAJOR}|g" src/gvcver.h %build make -f srcunx/unx.mak \ RPM_OPT_FLAGS="%{!?debug_package:-g0} $RPM_OPT_FLAGS" \ GSVIEW_BASE=%{_prefix} \ GSVIEW_BINDIR=%{_bindir} \ GSVIEW_MANDIR=%{_mandir} \ GSVIEW_DOCPATH=%{_docdir} \ GSVIEW_ETCPATH=%{_sysconfdir} %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir},%{_docdir},%{_sysconfdir}} make -f srcunx/unx.mak install \ GSVIEW_BASE=$RPM_BUILD_ROOT%{_prefix} \ GSVIEW_BINDIR=$RPM_BUILD_ROOT%{_bindir} \ GSVIEW_MANDIR=$RPM_BUILD_ROOT%{_mandir} \ GSVIEW_DOCPATH=$RPM_BUILD_ROOT%{_docdir} \ GSVIEW_ETCPATH=$RPM_BUILD_ROOT%{_sysconfdir} # desktop/icon files install -D -p -m644 binary/gsview48.png\ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/gsview.png desktop-file-install \ --dir="$RPM_BUILD_ROOT%{_datadir}/applications" \ --add-category="X-Livna" --vendor="" \ %{SOURCE1} ## Unpackaged files # nuke deprecated epstool, when (hopefully) packaged separately... someday. #rm -f $RPM_BUILD_ROOT{%{_bindir}/epstool,%{_docdir}/*/epstool*} %post touch --no-create %{_datadir}/icons/hicolor 2> /dev/null ||: gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: update-desktop-database -q %{_datadir}/applications > /dev/null 2>&1 || : %postun touch --no-create %{_datadir}/icons/hicolor 2> /dev/null ||: gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: update-desktop-database -q %{_datadir}/applications > /dev/null 2>&1 || : %files %defattr(-, root, root) %{_bindir}/* %dir %{_sysconfdir}/gsview %config(noreplace) %{_sysconfdir}/gsview/printer.ini %{_mandir}/man*/* %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*/*/* %doc %{_docdir}/* %clean rm -rf $RPM_BUILD_ROOT %changelog * Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 4.8-3 - rebuild * Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.8-2 - respin * Sun May 07 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.8-1 - 4.8 * Mon Apr 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.7-7 - rework for Livna * Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.7-6 - %%(rpm -q --qf '%%{VERSION}' ghostscript) -> %%(gs --version) - follow fdo icon spec - restore epstool bits * Fri Feb 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> - fc5: gcc/glibc respin * Fri Oct 21 2005 Rex Dieter <rexdieter[AT]users.sf.net> 4.7-5 - %%post/%%postun: update-desktop-database * Fri Aug 5 2005 Rex Dieter <rexdieter[AT]users.sf.net> 4.7-4 - ExcludeArch: ppc (sed busted?) * Thu Jul 28 2005 Rex Dieter <rexdieter[AT]users.sf.net> 4.7-3 - add file:// to help URL. * Thu Jun 23 2005 Rex Dieter <rexdieter[AT]users.sf.net> 4.7-2 - fixes for ghostscript-8.15 (#159912) - Change paper default A4->Letter * Wed Apr 20 2005 Rex Dieter <rexdieter[AT]users.sf.net> 4.7-1 - 4.7 * Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - rebuilt * Wed Jan 26 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0:4.6-9 - back to Req: ghostscript >= 7.07-15.3 for x86_64 (#146223) * Fri Aug 06 2004 Rex Dieter <rexdieter at sf.net> 0:4.6-0.fdr.8 - Patch to load libgs.so.7 by default (instead of libgs.so) - Req: libgs.so.7, dropping Req: ghostscript, allowing for users with older/custom ghostscript builds (will have to rework when/if ghostscript >= 8.0 comes) - .desktop: GenericName: PS/PDF Viewer * Thu Aug 05 2004 Rex Dieter <rexdieter at sf.net> 0:4.6-0.fdr.7 - remove Req: libgs.so - Req: ghostscript >= 7.07-15.3 (http://www.redhat.com/archives/fedora-devel-list/2004-August/msg00068.html) * Tue Aug 03 2004 Rex Dieter <rexdieter at sf.net> 0:4.6-0.fdr.6 - Requires: ghostscript >= 7.07-18 * Thu Apr 29 2004 Rex Dieter <rexdieter at sf.net> 0:4.6-0.fdr.5 - Group: Applications/Publishing - remove Vendor tag * Sat Apr 24 2004 Rex Dieter <rexdieter at sf.net> 0:4.6-0.fdr.4 - gsview.desktop: StartupWMClass=gsview * Sat Apr 24 2004 Rex Dieter <rexdieter at sf.net> 0:4.6-0.fdr.3 - don't include old epstool (to be packaged separately) - gsview.desktop: MimeType=image/x-eps;application/postscript;application/pdf; Categories=Application;GTK;Graphics;Viewer;Publishing; * Thu Apr 01 2004 Rex Dieter <rexdieter at sf.net> 0:4.6-0.fdr.2 - desktop-file default - patch default .desktop file for Categories * Tue Jan 20 2004 Rex Dieter <rexdieter at sf.net> 0:4.6-0.fdr.1 - 4.6 - desktop_file'ize * Fri Oct 31 2003 Rex Dieter <rexdieter at sf.net> 0:4.5-0.fdr.1 - 4.5 - Fedora Core support * Thu Jul 03 2003 Rex Dieter <rexdieter at sf.net> 0:4.4-0.fdr.0 - fedora'ize - htmlview patch Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/gsview/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 16:51:22 -0000 1.1 +++ .cvsignore 3 Aug 2008 14:30:18 -0000 1.2 @@ -0,0 +1 @@ +gsview-4.8.tar.gz Index: sources =================================================================== RCS file: /cvs/free/rpms/gsview/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:51:22 -0000 1.1 +++ sources 3 Aug 2008 14:30:18 -0000 1.2 @@ -0,0 +1 @@ +21c81819af0eeb42ac5ee6499f4a7116 gsview-4.8.tar.gz

16 years, 3 months

1
0
0 / 0

rpms/gpac/devel gpac-0.4.4-soname.patch, NONE, 1.1 gpac-0.4.5-libxml2.patch, NONE, 1.1 gpac-0.4.5-shared_amr.patch, NONE, 1.1 gpac-0.4.5-shared_sggen.patch, NONE, 1.1 gpac-0.4.5-system_libdir.patch, NONE, 1.1 gpac-0.4.5-system_openjpeg.patch, NONE, 1.1 gpac-0.4.5-timestramps.patch, NONE, 1.1 gpac-20080211cvs-gcc43-gnusource.patch, NONE, 1.1 gpac-20080211cvs-no-osmozilla.patch, NONE, 1.1 gpac-snapshot.sh, NONE, 1.1 gpac.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

by Thorsten Leemhuis

Author: thl Update of /cvs/free/rpms/gpac/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv21230 Modified Files: .cvsignore sources Added Files: gpac-0.4.4-soname.patch gpac-0.4.5-libxml2.patch gpac-0.4.5-shared_amr.patch gpac-0.4.5-shared_sggen.patch gpac-0.4.5-system_libdir.patch gpac-0.4.5-system_openjpeg.patch gpac-0.4.5-timestramps.patch gpac-20080211cvs-gcc43-gnusource.patch gpac-20080211cvs-no-osmozilla.patch gpac-snapshot.sh gpac.spec Log Message: initial import from livna gpac-0.4.4-soname.patch: --- NEW FILE gpac-0.4.4-soname.patch --- diff -up gpac/src/Makefile.soname gpac/src/Makefile --- gpac/src/Makefile.soname 2008-02-17 13:56:20.000000000 +0100 +++ gpac/src/Makefile 2008-02-17 13:56:20.000000000 +0100 @@ -159,6 +159,7 @@ ifeq ($(CONFIG_DARWIN),yes) LDFLAGS+=-install_name $(prefix)/lib/$(LIB) endif EXTRALIBS+=$(GPAC_SH_FLAGS) +LDFLAGS+="-Wl,-soname,libgpac.so.0" endif ifeq ($(WANT_PIC),yes) gpac-0.4.5-libxml2.patch: --- NEW FILE gpac-0.4.5-libxml2.patch --- diff -up gpac/applications/generators/SVG/Makefile.libxml2 gpac/applications/generators/SVG/Makefile --- gpac/applications/generators/SVG/Makefile.libxml2 2008-02-17 19:12:02.000000000 +0100 +++ gpac/applications/generators/SVG/Makefile 2008-02-17 19:12:41.000000000 +0100 @@ -37,7 +37,7 @@ SRCS := $(OBJS:.o=.c) all: $(PROG) SVGGen$(EXE): $(OBJS) - $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(XML2_LFLAGS) $(EXTRALIBS) + $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(XML2_LIBS) $(EXTRALIBS) %.o: %.c diff -up gpac/configure.libxml2 gpac/configure --- gpac/configure.libxml2 2008-02-17 19:13:07.000000000 +0100 +++ gpac/configure 2008-02-17 20:09:09.000000000 +0100 @@ -59,6 +59,7 @@ has_oss_audio="no" has_alsa="no" has_x11="no" has_x11_shm="no" +has_libxml2="no" disable_svg="no" no_gcc_opt="no" use_fixed_point="no" @@ -892,6 +893,15 @@ for opt do esac done +# If svg isn't disabled +if test "$disable_svg" != "yes"; then +# Then we check libxm2 presence via pkg-config + if pkg-config libxml-2.0 --exists > /dev/null 2>&1 ; then + libxml2_cflags=`pkg-config libxml-2.0 --cflags` + libxml2_lib_flags=`pkg-config libxml-2.0 --libs` + has_libxml2="yes" + fi +fi #look for X11 shared memory support cat > $TMPC << EOF @@ -1256,6 +1266,11 @@ echo "CONFIG_FFMPEG=$has_ffmpeg" >> conf echo "CONFIG_OSS_AUDIO=$has_oss_audio" >> config.mak echo "CONFIG_ALSA=$has_alsa" >> config.mak echo "DISABLE_SVG=$disable_svg" >> config.mak +echo "HAS_LIBXML2=$has_libxml2" >> config.mak +if test "$has_libxml2" = "yes"; then + echo "XML2_CFLAGS=$libxml2_cflags" >> config.mak + echo "XML2_LIBS=$libxml2_lib_flags" >> config.mak +fi echo "HAS_OPENGL=$has_opengl" >> config.mak if test "$has_opengl" = "yes" ; then echo "OGL_LIBS=$LINK3D" >> config.mak gpac-0.4.5-shared_amr.patch: --- NEW FILE gpac-0.4.5-shared_amr.patch --- diff -up gpac/modules/amr_dec/amr_dec.c.amr gpac/modules/amr_dec/amr_dec.c --- gpac/modules/amr_dec/amr_dec.c.amr 2008-02-17 23:43:55.000000000 +0100 +++ gpac/modules/amr_dec/amr_dec.c 2008-02-17 23:44:20.000000000 +0100 @@ -29,8 +29,8 @@ #include <gpac/modules/service.h> #include <gpac/constants.h> -#include "amr_nb/sp_dec.h" -#include "amr_nb/d_homing.h" +#include <amrnb/sp_dec.h> +#include <amrnb/d_homing.h> /*default size in CU of composition memory for audio*/ diff -up gpac/modules/amr_dec/Makefile.amr gpac/modules/amr_dec/Makefile --- gpac/modules/amr_dec/Makefile.amr 2008-02-17 23:39:25.000000000 +0100 +++ gpac/modules/amr_dec/Makefile 2008-02-17 23:43:23.000000000 +0100 @@ -17,30 +17,30 @@ LDFLAGS+=-pg endif #common obj -OBJS=amr_in.o amr_dec.o \ - ./amr_nb/agc.o ./amr_nb/autocorr.o ./amr_nb/az_lsp.o ./amr_nb/bits2prm.o ./amr_nb/cl_ltp.o \ - ./amr_nb/convolve.o ./amr_nb/c1035pf.o ./amr_nb/d_plsf.o ./amr_nb/d_plsf_5.o ./amr_nb/d_gain_c.o \ - ./amr_nb/d_gain_p.o ./amr_nb/dec_lag6.o ./amr_nb/d1035pf.o ./amr_nb/cor_h.o ./amr_nb/enc_lag3.o \ - ./amr_nb/enc_lag6.o ./amr_nb/g_code.o ./amr_nb/g_pitch.o ./amr_nb/int_lpc.o ./amr_nb/inter_36.o \ - ./amr_nb/inv_sqrt.o ./amr_nb/lag_wind.o ./amr_nb/levinson.o ./amr_nb/lsp_az.o ./amr_nb/lsp_lsf.o \ - ./amr_nb/ol_ltp.o ./amr_nb/pitch_fr.o ./amr_nb/pitch_ol.o ./amr_nb/pow2.o ./amr_nb/pre_big.o \ - ./amr_nb/pre_proc.o ./amr_nb/pred_lt.o ./amr_nb/preemph.o ./amr_nb/prm2bits.o ./amr_nb/pstfilt.o \ - ./amr_nb/q_gain_c.o ./amr_nb/q_gain_p.o ./amr_nb/q_plsf.o ./amr_nb/q_plsf_5.o ./amr_nb/lsfwt.o \ - ./amr_nb/reorder.o ./amr_nb/residu.o ./amr_nb/lsp.o ./amr_nb/lpc.o ./amr_nb/ec_gains.o \ - ./amr_nb/spreproc.o ./amr_nb/syn_filt.o ./amr_nb/weight_a.o ./amr_nb/qua_gain.o \ - ./amr_nb/gc_pred.o ./amr_nb/q_plsf_3.o ./amr_nb/post_pro.o ./amr_nb/dec_lag3.o ./amr_nb/dec_gain.o \ - ./amr_nb/d_plsf_3.o ./amr_nb/d4_17pf.o ./amr_nb/c4_17pf.o ./amr_nb/d3_14pf.o ./amr_nb/c3_14pf.o \ - ./amr_nb/d2_11pf.o ./amr_nb/c2_11pf.o ./amr_nb/d2_9pf.o ./amr_nb/c2_9pf.o ./amr_nb/cbsearch.o \ - ./amr_nb/spstproc.o ./amr_nb/gain_q.o ./amr_nb/cod_amr.o ./amr_nb/dec_amr.o ./amr_nb/sp_enc.o \ - ./amr_nb/sp_dec.o ./amr_nb/ph_disp.o ./amr_nb/g_adapt.o ./amr_nb/calc_en.o ./amr_nb/qgain795.o \ - ./amr_nb/qgain475.o ./amr_nb/sqrt_l.o ./amr_nb/set_sign.o ./amr_nb/s10_8pf.o ./amr_nb/bgnscd.o \ - ./amr_nb/gmed_n.o ./amr_nb/mac_32.o ./amr_nb/ex_ctrl.o ./amr_nb/c_g_aver.o ./amr_nb/lsp_avg.o \ - ./amr_nb/int_lsf.o ./amr_nb/c8_31pf.o ./amr_nb/d8_31pf.o ./amr_nb/p_ol_wgh.o ./amr_nb/ton_stab.o \ - ./amr_nb/vad1.o ./amr_nb/dtx_enc.o ./amr_nb/dtx_dec.o ./amr_nb/a_refl.o ./amr_nb/b_cn_cod.o \ - ./amr_nb/calc_cor.o ./amr_nb/hp_max.o ./amr_nb/vadname.o ./amr_nb/vad2.o ./amr_nb/r_fft.o \ - ./amr_nb/lflg_upd.o ./amr_nb/e_homing.o ./amr_nb/d_homing.o ./amr_nb/basicop2.o \ - ./amr_nb/count.o ./amr_nb/oper_32b.o ./amr_nb/copy.o ./amr_nb/log2.o \ - ./amr_nb/set_zero.o ./amr_nb/strfunc.o ./amr_nb/n_proc.o ./amr_nb/sid_sync.o +OBJS=amr_in.o amr_dec.o +# ./amr_nb/agc.o ./amr_nb/autocorr.o ./amr_nb/az_lsp.o ./amr_nb/bits2prm.o ./amr_nb/cl_ltp.o \ +# ./amr_nb/convolve.o ./amr_nb/c1035pf.o ./amr_nb/d_plsf.o ./amr_nb/d_plsf_5.o ./amr_nb/d_gain_c.o \ +# ./amr_nb/d_gain_p.o ./amr_nb/dec_lag6.o ./amr_nb/d1035pf.o ./amr_nb/cor_h.o ./amr_nb/enc_lag3.o \ +# ./amr_nb/enc_lag6.o ./amr_nb/g_code.o ./amr_nb/g_pitch.o ./amr_nb/int_lpc.o ./amr_nb/inter_36.o \ +# ./amr_nb/inv_sqrt.o ./amr_nb/lag_wind.o ./amr_nb/levinson.o ./amr_nb/lsp_az.o ./amr_nb/lsp_lsf.o \ +# ./amr_nb/ol_ltp.o ./amr_nb/pitch_fr.o ./amr_nb/pitch_ol.o ./amr_nb/pow2.o ./amr_nb/pre_big.o \ +# ./amr_nb/pre_proc.o ./amr_nb/pred_lt.o ./amr_nb/preemph.o ./amr_nb/prm2bits.o ./amr_nb/pstfilt.o \ +# ./amr_nb/q_gain_c.o ./amr_nb/q_gain_p.o ./amr_nb/q_plsf.o ./amr_nb/q_plsf_5.o ./amr_nb/lsfwt.o \ +# ./amr_nb/reorder.o ./amr_nb/residu.o ./amr_nb/lsp.o ./amr_nb/lpc.o ./amr_nb/ec_gains.o \ +# ./amr_nb/spreproc.o ./amr_nb/syn_filt.o ./amr_nb/weight_a.o ./amr_nb/qua_gain.o \ +# ./amr_nb/gc_pred.o ./amr_nb/q_plsf_3.o ./amr_nb/post_pro.o ./amr_nb/dec_lag3.o ./amr_nb/dec_gain.o \ +# ./amr_nb/d_plsf_3.o ./amr_nb/d4_17pf.o ./amr_nb/c4_17pf.o ./amr_nb/d3_14pf.o ./amr_nb/c3_14pf.o \ +# ./amr_nb/d2_11pf.o ./amr_nb/c2_11pf.o ./amr_nb/d2_9pf.o ./amr_nb/c2_9pf.o ./amr_nb/cbsearch.o \ +# ./amr_nb/spstproc.o ./amr_nb/gain_q.o ./amr_nb/cod_amr.o ./amr_nb/dec_amr.o ./amr_nb/sp_enc.o \ +# ./amr_nb/sp_dec.o ./amr_nb/ph_disp.o ./amr_nb/g_adapt.o ./amr_nb/calc_en.o ./amr_nb/qgain795.o \ +# ./amr_nb/qgain475.o ./amr_nb/sqrt_l.o ./amr_nb/set_sign.o ./amr_nb/s10_8pf.o ./amr_nb/bgnscd.o \ +# ./amr_nb/gmed_n.o ./amr_nb/mac_32.o ./amr_nb/ex_ctrl.o ./amr_nb/c_g_aver.o ./amr_nb/lsp_avg.o \ +# ./amr_nb/int_lsf.o ./amr_nb/c8_31pf.o ./amr_nb/d8_31pf.o ./amr_nb/p_ol_wgh.o ./amr_nb/ton_stab.o \ +# ./amr_nb/vad1.o ./amr_nb/dtx_enc.o ./amr_nb/dtx_dec.o ./amr_nb/a_refl.o ./amr_nb/b_cn_cod.o \ +# ./amr_nb/calc_cor.o ./amr_nb/hp_max.o ./amr_nb/vadname.o ./amr_nb/vad2.o ./amr_nb/r_fft.o \ +# ./amr_nb/lflg_upd.o ./amr_nb/e_homing.o ./amr_nb/d_homing.o ./amr_nb/basicop2.o \ +# ./amr_nb/count.o ./amr_nb/oper_32b.o ./amr_nb/copy.o ./amr_nb/log2.o \ +# ./amr_nb/set_zero.o ./amr_nb/strfunc.o ./amr_nb/n_proc.o ./amr_nb/sid_sync.o SRCS := $(OBJS:.o=.c) @@ -55,12 +55,14 @@ OBJSPIC=$(OBJS:.o=.opic) else OBJSPIC=$(OBJS) endif +AMR_NB_LIBS=-lamrnb +AMR_WB_LIBS=-lamrwb all: $(LIB) $(LIB): $(OBJS) - $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac + $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(AMR_NB_LIBS) $(AMR_WB_LIBS) $(EXTRALIBS) -L../../bin/gcc -lgpac %.o: %.c diff -up gpac/modules/amr_float_dec/Makefile.amr gpac/modules/amr_float_dec/Makefile --- gpac/modules/amr_float_dec/Makefile.amr 2008-02-17 23:26:57.000000000 +0100 +++ gpac/modules/amr_float_dec/Makefile 2008-02-17 23:35:00.000000000 +0100 @@ -21,16 +21,18 @@ OBJS=../amr_dec/amr_in.o amr_float_dec.o #AMR NB obj CFLAGS+=-DGPAC_HAS_AMR_FT ifeq ($(CONFIG_AMR_NB_FT), yes) -OBJS+=./amr_nb_ft/interf_dec.o ./amr_nb_ft/interf_enc.o ./amr_nb_ft/sp_dec.o ./amr_nb_ft/sp_enc.o +#OBJS+=./amr_nb_ft/interf_dec.o ./amr_nb_ft/interf_enc.o ./amr_nb_ft/sp_dec.o ./amr_nb_ft/sp_enc.o +AMR_NB_LIBS=-lamrnb endif #AMR WB obj CFLAGS+=-DGPAC_HAS_AMR_FT_WB ifeq ($(CONFIG_AMR_WB_FT), yes) -OBJS+=./amr_wb_ft/dec_acelp.o ./amr_wb_ft/dec_dtx.o ./amr_wb_ft/dec_gain.o ./amr_wb_ft/dec_if.o ./amr_wb_ft/dec_lpc.o ./amr_wb_ft/dec_main.o \ - ./amr_wb_ft/dec_rom.o ./amr_wb_ft/dec_util.o ./amr_wb_ft/enc_acelp.o ./amr_wb_ft/enc_dtx.o ./amr_wb_ft/enc_gain.o ./amr_wb_ft/enc_if.o \ - ./amr_wb_ft/enc_lpc.o ./amr_wb_ft/enc_main.o ./amr_wb_ft/enc_rom.o ./amr_wb_ft/enc_util.o ./amr_wb_ft/if_rom.o +#OBJS+=./amr_wb_ft/dec_acelp.o ./amr_wb_ft/dec_dtx.o ./amr_wb_ft/dec_gain.o ./amr_wb_ft/dec_if.o ./amr_wb_ft/dec_lpc.o ./amr_wb_ft/dec_main.o \ +# ./amr_wb_ft/dec_rom.o ./amr_wb_ft/dec_util.o ./amr_wb_ft/enc_acelp.o ./amr_wb_ft/enc_dtx.o ./amr_wb_ft/enc_gain.o ./amr_wb_ft/enc_if.o \ +# ./amr_wb_ft/enc_lpc.o ./amr_wb_ft/enc_main.o ./amr_wb_ft/enc_rom.o ./amr_wb_ft/enc_util.o ./amr_wb_ft/if_rom.o +AMR_WB_LIBS=-lamrwb endif @@ -51,7 +53,7 @@ all: $(LIB) $(LIB): $(OBJSPIC) - $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac + $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(AMR_NB_LIBS) $(AMR_WB_LIBS) $(EXTRALIBS) -L../../bin/gcc -lgpac %.o: %.c diff -up gpac/modules/amr_float_dec/amr_float_dec.c.amr gpac/modules/amr_float_dec/amr_float_dec.c --- gpac/modules/amr_float_dec/amr_float_dec.c.amr 2006-12-13 16:12:05.000000000 +0100 +++ gpac/modules/amr_float_dec/amr_float_dec.c 2008-02-17 23:38:03.000000000 +0100 @@ -31,12 +31,12 @@ #ifdef GPAC_HAS_AMR_FT /*AMR NB*/ -#include "amr_nb_ft/interf_dec.h" +#include "amrnb/interf_dec.h" #endif #ifdef GPAC_HAS_AMR_FT_WB /*AMR WB*/ -#include "amr_wb_ft/dec_if.h" +#include "amrwb/dec_if.h" #endif /*default size in CU of composition memory for audio*/ gpac-0.4.5-shared_sggen.patch: --- NEW FILE gpac-0.4.5-shared_sggen.patch --- diff -up gpac/applications/generators/SVG/Makefile.shared gpac/applications/generators/SVG/Makefile --- gpac/applications/generators/SVG/Makefile.shared 2007-01-09 13:43:57.000000000 +0100 +++ gpac/applications/generators/SVG/Makefile 2008-02-17 17:56:49.000000000 +0100 @@ -15,7 +15,7 @@ LDFLAGS+=-pg endif #common obj -OBJS= html.o laser.o main.o v1.o v2.o v3.o ../../../src/utils/list.o ../../../src/utils/error.o +OBJS= html.o laser.o main.o v1.o v2.o v3.o CFLAGS+=-g LDFLAGS+=-g @@ -24,10 +24,12 @@ CFLAGS+=$(XML2_CFLAGS) ifeq ($(CONFIG_WIN32),yes) EXE=.exe PROG=SVGGen$(EXE) +OBJS= html.o laser.o main.o v1.o v2.o v3.o ../../../src/utils/list.o ../../../src/utils/error.o EXTRALIBS+=-lwsock32 -lz else EXT= PROG=SVGGen +LIBS=-L../../../bin/gcc/ -lgpac endif SRCS := $(OBJS:.o=.c) @@ -35,7 +37,7 @@ SRCS := $(OBJS:.o=.c) all: $(PROG) SVGGen$(EXE): $(OBJS) - $(CC) $(LDFLAGS) -o $@ $(OBJS) $(XML2_LFLAGS) $(EXTRALIBS) + $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(XML2_LFLAGS) $(EXTRALIBS) %.o: %.c diff -up gpac/applications/generators/X3D/Makefile.shared gpac/applications/generators/X3D/Makefile --- gpac/applications/generators/X3D/Makefile.shared 2006-05-24 11:52:52.000000000 +0200 +++ gpac/applications/generators/X3D/Makefile 2008-02-17 17:56:09.000000000 +0100 @@ -15,15 +15,16 @@ LDFLAGS+=-pg endif #common obj -OBJS= main.o ../../../src/utils/list.o ../../../src/utils/error.o +OBJS= main.o ifeq ($(CONFIG_WIN32),yes) EXE=.exe PROG=X3DGen$(EXE) +OBJS= main.o ../../../src/utils/list.o ../../../src/utils/error.o else -OBJS+=../../../src/utils/os_divers.o EXT= PROG=X3DGen +LIBS=-L../../../bin/gcc/ -lgpac endif SRCS := $(OBJS:.o=.c) @@ -31,7 +32,7 @@ SRCS := $(OBJS:.o=.c) all: $(PROG) $(PROG): $(OBJS) - $(CC) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) + $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRALIBS) %.o: %.c diff -up gpac/applications/generators/MPEG4/Makefile.shared gpac/applications/generators/MPEG4/Makefile --- gpac/applications/generators/MPEG4/Makefile.shared 2006-05-24 11:52:52.000000000 +0200 +++ gpac/applications/generators/MPEG4/Makefile 2008-02-17 17:55:25.000000000 +0100 @@ -15,15 +15,16 @@ LDFLAGS+=-pg endif #common obj -OBJS= main.o ../../../src/utils/list.o ../../../src/utils/error.o +OBJS= main.o ifeq ($(CONFIG_WIN32),yes) EXE=.exe PROG=MPEG4Gen$(EXE) +OBJS= main.o ../../../src/utils/list.o ../../../src/utils/error.o else -OBJS+=../../../src/utils/os_divers.o EXT= PROG=MPEG4Gen +LIBS=-L../../../bin/gcc/ -lgpac endif SRCS := $(OBJS:.o=.c) @@ -31,7 +32,7 @@ SRCS := $(OBJS:.o=.c) all: $(PROG) $(PROG): $(OBJS) - $(CC) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) + $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRALIBS) %.o: %.c gpac-0.4.5-system_libdir.patch: --- NEW FILE gpac-0.4.5-system_libdir.patch --- diff -up gpac/Makefile.libdir gpac/Makefile --- gpac/Makefile.libdir 2007-08-28 14:51:16.000000000 +0200 +++ gpac/Makefile 2008-02-17 14:47:22.000000000 +0100 @@ -63,11 +63,11 @@ ifeq ($(DEBUGBUILD),no) $(STRIP) bin/gcc/libgpac.$(DYN_LIB_SUFFIX) endif ifeq ($(CONFIG_DARWIN),yes) - install -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/lib/libgpac-$(VERSION).$(DYN_LIB_SUFFIX) - ln -sf libgpac-$(VERSION).$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/lib/libgpac.$(DYN_LIB_SUFFIX) + install -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(DESTDIR)$(libdir)/libgpac-$(VERSION).$(DYN_LIB_SUFFIX) + ln -sf libgpac-$(VERSION).$(DYN_LIB_SUFFIX) $(DESTDIR)$(libdir)/libgpac.$(DYN_LIB_SUFFIX) else - install $(INSTFLAGS) -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/lib/libgpac-$(VERSION).$(DYN_LIB_SUFFIX) - ln -sf libgpac-$(VERSION).$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/lib/libgpac.$(DYN_LIB_SUFFIX) + install $(INSTFLAGS) -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(DESTDIR)$(libdir)/libgpac-$(VERSION).$(DYN_LIB_SUFFIX) + ln -sf libgpac-$(VERSION).$(DYN_LIB_SUFFIX) $(DESTDIR)$(libdir)/libgpac.$(DYN_LIB_SUFFIX) ldconfig || true endif endif @@ -98,7 +98,7 @@ install-lib: mkdir -p "$(DESTDIR)$(prefix)/include/gpac/modules" install -m 644 $(SRC_PATH)/include/gpac/modules/*.h "$(DESTDIR)$(prefix)/include/gpac/modules" mkdir -p "$(DESTDIR)$(prefix)/lib" - install -m 644 "./bin/gcc/libgpac_static.a" "$(DESTDIR)$(prefix)/lib" + install -m 644 "./bin/gcc/libgpac_static.a" "$(DESTDIR)$(libdir)" uninstall-lib: rm -rf "$(prefix)/include/gpac/internal" diff -up gpac/configure.libdir gpac/configure --- gpac/configure.libdir 2007-10-25 11:39:51.000000000 +0200 +++ gpac/configure 2008-02-17 14:53:30.000000000 +0100 @@ -106,6 +106,7 @@ EOF echo "GPAC configuration options:" echo " --help print this message" echo " --prefix=PREFIX install in PREFIX [$prefix]" +echo " --libdir=LIBDIR system libs in DIR [$libdir]" echo " --mandir=DIR man documentation in DIR [PREFIX/man]" echo "" echo " --source-path=PATH path of source code [$source_path]" @@ -167,6 +168,8 @@ for opt do case "$opt" in --prefix=*) prefix=`echo $opt | cut -d '=' -f 2` ;; + --libdir=*) libdir=`echo $opt | cut -d '=' -f 2` + ;; --mandir=*) mandir=`echo $opt | cut -d '=' -f 2` ;; --source-path=*) source_path=`echo $opt | cut -d '=' -f 2` @@ -479,7 +482,7 @@ fi if $cc -o $TMPO $TMPC $LINK3D 2> /dev/null ; then has_opengl="yes" -elif $cc -o $TMPO $TMPC -I$X11_PATH/include -L$X11_PATH/lib 2> /dev/null ; then +elif $cc -o $TMPO $TMPC -I$X11_PATH/include -L$X11_PATH/lib -L${libdir} 2> /dev/null ; then has_opengl="yes" fi @@ -895,7 +898,7 @@ cat > $TMPC << EOF #include <X11/Xlib.h> int main( void ) { return 0; } EOF -if $cc -o $TMPO $TMPC -I$X11_PATH/include -L$X11_PATH/lib 2> /dev/null ; then +if $cc -o $TMPO $TMPC -I$X11_PATH/include -L$X11_PATH/lib -L${libdir} 2> /dev/null ; then has_x11="yes" #look for X11 shared memory support @@ -1173,8 +1176,9 @@ fi fi echo "prefix=$prefix" >> config.mak +echo "libdir=$libdir" >> config.mak echo "DESTDIR=$DESTDIR" >> config.mak -echo "moddir=$prefix/lib/gpac" >> config.mak +echo "moddir=$libdir/gpac" >> config.mak echo "mandir=$mandir" >> config.mak echo "MAKE=$make" >> config.mak echo "CC=$cc" >> config.mak gpac-0.4.5-system_openjpeg.patch: --- NEW FILE gpac-0.4.5-system_openjpeg.patch --- diff -up gpac/configure.openjpeg gpac/configure --- gpac/configure.openjpeg 2008-02-17 15:16:22.000000000 +0100 +++ gpac/configure 2008-02-17 15:16:31.000000000 +0100 @@ -526,17 +526,17 @@ fi #look for OpenJPEG support cat > $TMPC << EOF #include <stdio.h> -#include <openjpeg.h> +#include <openjpeg/openjpeg.h> int main( void ) { return 0; } EOF -if $cc -o $TMPO $TMPC -lopenjpeg 2> /dev/null ; then +if $cc -o $TMPO $TMPC -lopenjpeg -lm -L${libdir} 2> /dev/null ; then has_openjpeg="system" elif test "$alt_macosx_dir" != "" ; then if cc -o $TMPO $TMPC -I$alt_macosx_dir/include -L$alt_macosx_dir/lib -ljpeg 2> /dev/null ; then has_openjpeg="system" fi -elif $cc -o $TMPO $TMPC -I$local_inc/openjpeg -L$local_lib -lopenjpeg 2> /dev/null ; then +elif $cc -o $TMPO $TMPC -I$local_inc/openjpeg -L$local_lib -lopenjpeg -lm 2> /dev/null ; then has_openjpeg="local" fi diff -up gpac/modules/img_in/jp2_dec.c.openjpeg gpac/modules/img_in/jp2_dec.c --- gpac/modules/img_in/jp2_dec.c.openjpeg 2007-09-12 18:47:11.000000000 +0200 +++ gpac/modules/img_in/jp2_dec.c 2008-02-17 15:16:22.000000000 +0100 @@ -26,7 +26,7 @@ #ifdef GPAC_HAS_JP2 -#include <openjpeg.h> +#include <openjpeg/openjpeg.h> typedef struct { gpac-0.4.5-timestramps.patch: --- NEW FILE gpac-0.4.5-timestramps.patch --- diff -up gpac/Makefile.timestramps gpac/Makefile --- gpac/Makefile.timestramps 2008-02-17 15:34:31.000000000 +0100 +++ gpac/Makefile 2008-02-17 15:36:34.000000000 +0100 @@ -54,8 +54,8 @@ install: $(MAKE) -C applications install install -d "$(DESTDIR)$(moddir)" install bin/gcc/*.$(DYN_LIB_SUFFIX) "$(DESTDIR)$(moddir)" - rm -f $(DESTDIR)$(moddir)/libgpac.$(DYN_LIB_SUFFIX) - rm -f $(DESTDIR)$(moddir)/nposmozilla.$(DYN_LIB_SUFFIX) + #rm -f $(DESTDIR)$(moddir)/libgpac.$(DYN_LIB_SUFFIX) + #rm -f $(DESTDIR)$(moddir)/nposmozilla.$(DYN_LIB_SUFFIX) ifeq ($(CONFIG_WIN32),yes) install $(INSTFLAGS) -m 755 bin/gcc/libgpac.dll $(prefix)/lib else @@ -73,11 +73,11 @@ endif endif install -d "$(DESTDIR)$(mandir)" install -d "$(DESTDIR)$(mandir)/man1" - install -m 644 doc/man/mp4box.1 $(DESTDIR)$(mandir)/man1/ - install -m 644 doc/man/mp4client.1 $(DESTDIR)$(mandir)/man1/ - install -m 644 doc/man/gpac.1 $(DESTDIR)$(mandir)/man1/ + install -pm 644 doc/man/mp4box.1 $(DESTDIR)$(mandir)/man1/ + install -pm 644 doc/man/mp4client.1 $(DESTDIR)$(mandir)/man1/ + install -pm 644 doc/man/gpac.1 $(DESTDIR)$(mandir)/man1/ install -d "$(DESTDIR)$(prefix)/share/gpac" - install -m 644 doc/gpac.mp4 $(DESTDIR)$(prefix)/share/gpac/ + install -pm 644 doc/gpac.mp4 $(DESTDIR)$(prefix)/share/gpac/ uninstall: $(MAKE) -C applications uninstall @@ -92,11 +92,11 @@ uninstall: install-lib: mkdir -p "$(DESTDIR)$(prefix)/include/gpac" - install -m 644 $(SRC_PATH)/include/gpac/*.h "$(DESTDIR)$(prefix)/include/gpac" + install -pm 644 $(SRC_PATH)/include/gpac/*.h "$(DESTDIR)$(prefix)/include/gpac" mkdir -p "$(DESTDIR)$(prefix)/include/gpac/internal" - install -m 644 $(SRC_PATH)/include/gpac/internal/*.h "$(DESTDIR)$(prefix)/include/gpac/internal" + install -pm 644 $(SRC_PATH)/include/gpac/internal/*.h "$(DESTDIR)$(prefix)/include/gpac/internal" mkdir -p "$(DESTDIR)$(prefix)/include/gpac/modules" - install -m 644 $(SRC_PATH)/include/gpac/modules/*.h "$(DESTDIR)$(prefix)/include/gpac/modules" + install -pm 644 $(SRC_PATH)/include/gpac/modules/*.h "$(DESTDIR)$(prefix)/include/gpac/modules" mkdir -p "$(DESTDIR)$(prefix)/lib" install -m 644 "./bin/gcc/libgpac_static.a" "$(DESTDIR)$(libdir)" gpac-20080211cvs-gcc43-gnusource.patch: --- NEW FILE gpac-20080211cvs-gcc43-gnusource.patch --- --- Makefile.old 2008-02-11 18:31:29.000000000 -0500 +++ Makefile 2008-02-11 18:15:30.000000000 -0500 @@ -2,7 +2,7 @@ vpath %.c $(SRC_PATH)/src -CFLAGS= $(OPTFLAGS) -Wall -I$(SRC_PATH)/include +CFLAGS= $(OPTFLAGS) -Wall -I$(SRC_PATH)/include -D_GNU_SOURCE=1 ifeq ($(DEBUGBUILD), yes) CFLAGS+=-g gpac-20080211cvs-no-osmozilla.patch: --- NEW FILE gpac-20080211cvs-no-osmozilla.patch --- --- Makefile.old 2008-02-11 18:27:28.000000000 -0500 +++ Makefile 2008-02-11 18:28:13.000000000 -0500 @@ -11,13 +11,13 @@ V4STUDIODIR= INSTDIRS=mp4client -ifeq ($(TARGET_ARCH_ARMV4L),yes) -else -ifeq ($(CONFIG_LINUX),yes) -INSTDIRS+=osmozilla -APPDIRS+=osmozilla -endif -endif +#ifeq ($(TARGET_ARCH_ARMV4L),yes) +#else +#ifeq ($(CONFIG_LINUX),yes) +#INSTDIRS+=osmozilla +#APPDIRS+=osmozilla +#endif +#endif ifeq ($(USE_WXWIDGETS), yes) APPDIRS+=osmo4_wx --- NEW FILE gpac-snapshot.sh --- #!/bin/bash set -e tmp=$(mktemp -d) trap cleanup EXIT cleanup() { set +e [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp" } unset CDPATH pwd=$(pwd) cvs=$(date +%Y%m%d) cd "$tmp" cvs -z3 -d:pserver:anonymous@gpac.cvs.sourceforge.net:/cvsroot/gpac co -P gpac find . -type d -name CVS -print0 | xargs -0r rm -rf chmod 755 gpac/configure rm -rf gpac/extra_lib/ tar jcf "$pwd"/gpac-$cvs.tar.bz2 gpac cd - >/dev/null --- NEW FILE gpac.spec --- # Todo: - Patch-in xulrunner support within configure with pkg-config support. # - Add pkg-config support for libs detection. # - Add pkg-config support generated form configure for gpac (same as ffmpeg). # - Make it support swscaler enabled ffmpeg (at least test it - upstream). # - Debug Osmo4 (don't even work). # - Submit and import patches upstream. # - Fix unused-direct-shlib-dependency on libgpac %define osmo Osmo4 %define cvs 20080217 %define with_amr 0 %define with_mozilla 0 %define with_static 1 %define with_osmo 0 # Mozilla stuff fails. It's completely disabled for now. %define mozver 3.0 %define geckover 1.9 %define xuldir %{_datadir}/idl/xulrunner-sdk-1.9pre %define xulbindir %{_libdir}/xulrunner-%{geckover}pre Name: gpac Summary: MPEG-4 multimedia framework Version: 0.4.5 Release: 0.4.%{cvs}cvs%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://gpac.sourceforge.net/ #Source0: http://downloads.sourceforge.net/gpac/gpac-0.4.4.tar.gz Source0: http://rpms.kwizart.net/fedora/SOURCES/gpac-%{cvs}.tar.bz2 Source10: %{name}-snapshot.sh Patch0: gpac-20080211cvs-gcc43-gnusource.patch Patch1: gpac-20080211cvs-no-osmozilla.patch Patch2: gpac-0.4.4-soname.patch Patch3: gpac-0.4.5-system_libdir.patch Patch4: gpac-0.4.5-system_openjpeg.patch Patch5: gpac-0.4.5-timestramps.patch Patch6: gpac-0.4.5-shared_sggen.patch Patch7: gpac-0.4.5-libxml2.patch Patch8: gpac-0.4.5-shared_amr.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) BuildRequires: ImageMagick BuildRequires: SDL-devel BuildRequires: librsvg2-devel >= 2.5.0 BuildRequires: libGLU-devel BuildRequires: freeglut-devel BuildRequires: freetype-devel >= 2.1.4 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: libxml2-devel BuildRequires: openssl-devel BuildRequires: openjpeg-devel BuildRequires: zlib-devel BuildRequires: libogg-devel libvorbis-devel libtheora-devel BuildRequires: libXt-devel BuildRequires: libXpm-devel BuildRequires: wxGTK-devel %if %{with_mozilla} BuildRequires: gecko-devel >= %{geckoverver} BuildRequires: js-devel %endif BuildRequires: doxygen BuildRequires: desktop-file-utils %if %{with_amr} BuildRequires: amrnb-devel BuildRequires: amrwb-devel %endif %description GPAC is a multimedia framework based on the MPEG-4 Systems standard developed from scratch in ANSI C. The original development goal is to provide a clean, small and flexible alternative to the MPEG-4 Systems reference software. GPAC features the integration of recent multimedia standards (SVG/SMIL, VRML, X3D, SWF, 3GPP(2) tools and more) into a single framework. GPAC also features MPEG-4 Systems encoders/multiplexers, publishing tools for content distribution for MP4 and 3GPP(2) files and many tools for scene descriptions (MPEG4 <-> VRML <-> X3D converters, SWF -> MPEG-4, etc). %package libs Summary: Library for %{name} Group: System Environment/Libraries %description libs The %{name}-libs package contains library for %{name}. %package devel Summary: Development libraries and files for %{name} Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} %if %{with_static} %else %endif %description devel Development libraries and files for gpac. %if %{with_static} %package devel-static Summary: Development libraries and files for %{name} Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} %description devel-static Static library for gpac. %endif %if %{with_osmo} %package -n %{osmo} Summary: Media player based on gpac Group: Applications/Multimedia %description -n %{osmo} Osmo4 is an MPEG-4 player with the following features: * MPEG-4 Systems player * Optimized 2D graphics renderer compliant with the Complete2D Scene Graph and Graphics profiles * Video and audio presentation achieved through plugins * Multimedia player features: * Timeline controls: play, pause, step. * Graphics features: antialising, zoom and pan, scalable resizing of rendering area, basic full screen support. * Support for Advanced Text and Graphics extension of MPEG-4 Systems under standardization. * Frame export to JPG, PNG, BMP. %endif %if %{with_mozilla} %package -n mozilla-%{osmo} Summary: Osmo Media Player plugin for Mozilla compatible web browsers Group: Applications/Multimedia Requires: %{osmo} = %{version}-%{release} #Requires: firefox >= %{mozver} Requires: %{_libdir}/mozilla %description -n mozilla-%{osmo} This package contains the OSMO Media Player plugin for Mozilla compatible web browsers. %endif %prep %setup -q -n gpac pushd src %patch0 -b .patch0 popd pushd applications %patch1 -b .patch1 popd %patch2 -p1 -b .soname %patch3 -p1 -b .libdir %patch4 -p1 -b .openjpeg %patch5 -p1 -b .timestramps %patch6 -p1 -b .shared %patch7 -p1 -b .libxml2 %patch8 -p1 -b .amr ## 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 ## lib64 compatible - hardcoded with patch3 ## kwizart - lib64 compatible - modified #sed -i -e 's|lGLU|lGLU -L%{_libdir}|g' configure #sed -i -e 's|$(prefix)/lib/gpac|%{_libdir}/gpac|' configure #sed -i -e 's|$(prefix)/lib|%{_libdir}|' Makefile #sed -i -e 's|$(prefix)/include|%{_includedir}|' Makefile #sed -i -e 's|$(prefix)/lib/$(LIB)|%{_libdir}/$(LIB)|' Makefile #ifarch x86_64 ia64 ppc64 #sed -i -e 's|is_64="no"|is_64="yes"|' configure #endif # Fix openjpeg detection and built - hardcoded with patch4 #sed -i.openjpeg -e 's|openjpeg.h|openjpeg/openjpeg.h|' configure modules/img_in/jp2_dec.c # Fix compat-wxGTK26 use - seems unneeded but # sed -i -e 's|wx-config|wx-2.6-config|' configure # Update doxygen pushd doc doxygen -u popd # Fix encoding warnings cp -p Changelog Changelog.origine iconv -f ISO-8859-1 -t UTF8 Changelog.origine > Changelog touch -r Changelog.origine Changelog rm -rf Changelog.origine cp -p doc/ipmpx_syntax.bt doc/ipmpx_syntax.bt.origine iconv -f ISO-8859-1 -t UTF8 doc/ipmpx_syntax.bt.origine > doc/ipmpx_syntax.bt touch -r doc/ipmpx_syntax.bt.origine doc/ipmpx_syntax.bt rm -rf doc/ipmpx_syntax.bt.origine %build %configure \ --enable-debug \ --extra-cflags="$RPM_OPT_FLAGS" \ --libdir=%{_libdir} \ --disable-oss-audio \ %if %with_mozilla --mozdir=%{_libdir}/mozilla/plugins \ %endif %if %{with_amr} --enable-amr \ %endif --disable-static # --extra-cflags '-fshort-wchar -I/usr/include/xulrunner-sdk-1.9pre/stable -I/usr/include/nspr4' \ # ^ pkg-config libxul --cflags ## ## Osmo-zila plugin. ## %if %{with_mozilla} # # Rebuild osmozilla.xpt pushd applications/osmozilla %{xulbindir}/xpidl -m header -I%{xuldir}/stable -I%{xuldir}/unstable nsIOsmozilla.idl %{xulbindir}/xpidl -m typelib -I%{xuldir}/stable -I%{xuldir}/unstable nsIOsmozilla.idl %{xulbindir}/xpt_link nposmozilla.xpt nsIOsmozilla.xpt mv nsIOsmozilla.xpt nsIOsmozilla.xpt_linux popd ## kwizart - osmozilla parallel make fails # %{?_smp_mflags} #make -C applications/osmozilla \ # OPTFLAGS="%optflags -fPIC -I%{_includedir}/nspr4/" \ # INCLUDES="-I%{_datadir}/idl/firefox-%{mozver}/ \ # -I%{_includedir}/firefox-%{mozver}/ \ # -I%{_includedir}/firefox-%{mozver}/xpcom \ # -I%{_includedir}/nspr4/ $INCLUDES" \ # XPIDL_INCL="-I%{_datadir}/idl/firefox-%{mozver}/ \ # -I%{_includedir}/firefox-%{mozver}/ \ # -I%{_includedir}/firefox-%{mozver}/xpcom \ # -I%{_includedir}/nspr4/ $INCLUDES" \ # install %endif # Parallele build will fail make all OPTFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" #{?_smp_mflags} make sggen OPTFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" #{?_smp_mflags} ## kwizart - build doxygen doc for devel pushd doc doxygen popd %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install install-lib %if %{with_mozilla} ## kwizart - Install osmozilla plugin - make instmoz disabled. mkdir -p $RPM_BUILD_ROOT%{_libdir}/mozilla/{plugins,components} install -m 755 bin/gcc/nposmozilla.so $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/nposmozilla.so install -m 755 bin/gcc/nposmozilla.xpt $RPM_BUILD_ROOT%{_libdir}/mozilla/components/nposmozilla.xpt %endif %if %{with_osmo} # Desktop menu Osmo4 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications cat > %{osmo}.desktop <<EOF [Desktop Entry] Name=Osmo4 Media Player GenericName=Media Player Comment=MPEG-4 Media Player Exec=%{osmo} Terminal=false Icon=%{osmo}.xpm Type=Application Encoding=UTF-8 Categories=Application;AudioVideo;Player; EOF desktop-file-install --vendor livna \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --mode 644 \ %{osmo}.desktop #icons mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps install -m 0644 applications/osmo4_wx/osmo4.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{osmo}.xpm %else rm -rf $RPM_BUILD_ROOT%{_bindir}/%{osmo} %endif ## kwizart - rpmlint gpac no-ldconfig-symlink mv $RPM_BUILD_ROOT%{_libdir}/libgpac-%{version}-DEV.so $RPM_BUILD_ROOT%{_libdir}/libgpac.so.%{version} ln -sf libgpac.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libgpac.so.0 ln -sf libgpac.so.0 $RPM_BUILD_ROOT%{_libdir}/libgpac.so # Don't provide libgpac.so twice rm -rf $RPM_BUILD_ROOT%{_libdir}/gpac/libgpac.so #Install generated sggen binaries for b in MPEG4 SVG X3D; do pushd applications/generators/${b} install -pm 0755 ${b}Gen $RPM_BUILD_ROOT%{_bindir} popd done %clean rm -rf $RPM_BUILD_ROOT %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig %files %defattr(-,root,root) %doc AUTHORS BUGS Changelog COPYING README TODO %{_bindir}/MP4* %{_bindir}/*Gen %{_datadir}/gpac/ %{_mandir}/man1/*.1.* %files libs %defattr(-,root,root) %{_libdir}/libgpac.so.* %{_libdir}/gpac/ %if %{with_osmo} %files -n %{osmo} %doc AUTHORS BUGS COPYING README TODO %defattr(-,root,root) %{_bindir}/Osmo4 %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/%{osmo}.xpm %endif %if %{with_mozilla} %files -n mozilla-%{osmo} %defattr(-,root,root) %{_libdir}/mozilla/plugins/nposmozilla.so %{_libdir}/mozilla/components/nposmozilla.xpt %endif %files devel %doc doc/CODING_STYLE doc/ipmpx_syntax.bt %doc doc/html/* %defattr(-,root,root) %{_includedir}/gpac/ %{_libdir}/libgpac.so %if %{with_static} %files devel-static %defattr(-,root,root) %{_libdir}/libgpac_static.a %else %exclude %{_libdir}/libgpac_static.a %endif %changelog * Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.4.5-0.4.20080217cvs - rebuild * Mon Feb 25 2008 kwizart < kwizart at gmail.com > - 0.4.5-0.3.20080217cvs - Enable devel-static - Conditionalize Osmo4 (buggy). - Clean the spec * Sun Feb 17 2008 kwizart < kwizart at gmail.com > - 0.4.5-0.2.20080217cvs - Update to 20080217. - Split libs. - Use the new amr nosrc scheme (need an end-users rebuilt to add support to it). - Add openjpeg-devel missing BR - Static patching instead of dyn patch when possible. - Disable %%{smp_mflags} (it tries to build the bin before the lib is ready) - Define soname as libgpac.so.0 (instead of libgpac.so.%%version ) - Exclude static lib * Mon Feb 11 2008 Stewart Adam < s.adam at diffingo.com > - 0.4.5-0.1.20080211cvs - Use %%{smp_mflags} - Oops, we're actually 0.4.5 - Fix gpac so filenames - Only install nposmozilla when %%{with_firefox} is set * Mon Feb 11 2008 Stewart Adam < s.adam at diffingo.com > - 0.4.4-3.20080211cvs - Update to 20080211cvs - Disable osmozilla, doesn't build with xulrunner - Fix builds with gcc 4.3 * Sat Dec 15 2007 Stewart Adam < s.adam at diffingo.com > - 0.4.4-2 - Rebuild for rawhide * Tue Oct 16 2007 Stewart Adam < s.adam at diffingo.com > - 0.4.4-1 - Update to v4.4 * Sat May 26 2007 kwizart < kwizart at gmail.com > - 0.4.3-0.1cvs20070526 - Update to cvs 20070526 - Enable conditional build ( 3gpp firefox ) * Wed Apr 11 2007 kwizart < kwizart at gmail.com > - 0.4.3-0.1cvs20070411 - Update to cvs 20070411 * Thu Dec 08 2006 kwizart < kwizart at gmail.com > - 0.4.3-cvs20061208.1.kwizart.fc6 - Update to 20061208 - Uses firefox-devel (since fc6!) - Drop tutorial - Use version-DEV-date with libgpac.so - Disabled osmozilla - Fix soname - Enabled gprof * Tue Oct 17 2006 kwizart < kwizart at gmail.com > - 0.4.3-cvs20061017.1_FC5 - gpac snapshot.sh - Revert Patch osmozilla.cpp (v1.17 - build error from gpac/internal/terminal_dev.h) - TODO: - no-soname make option for libgpac.so - static lib in devel - needed ? - osmozilla - xpt link problem. - Osmo4: segmentation fault on exit. - MP4Client: segmentation fault on launch. - The program 'Osmo4' received an X Window System error: "The error was 'BadMatch (invalid parameter attributes)'. (Details: serial 37 error_code 8 request_code 42 minor_code 0)" - MP4Box -version display: GPAC version 0.4.3-DEV (try to display cvs ) * Sat Oct 15 2006 kwizart < kwizart at gmail.com > - 0.4.2-rc2.1_FC5 - Update to 0.4.2cvs20061017 - Use DESTDIR=RPM_BUILD_ROOT in various Makefile. - Enable mozilla plugin: osmozilla. - Enable AMR_NB_FLOAT and AMR_WB_FLOAT / bundle AMR_NB_FIXED (but not used by default). - Provide documentation html in doc . - Provide tutorial from http://www.wildamerica.com/pages/Marty.html - Various corrections. * Fri Sep 01 2006 Anssi Hannula <anssi(a)zarb.org> 0.4.1-0.20060630.2plf2007.0 - lib64 fixes * Fri Jan 30 2006 Austin Acton <austin(a)mandriva.org> 0.4.1-0.20060630.1plf2007.0 - initial package Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/gpac/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 16:51:02 -0000 1.1 +++ .cvsignore 3 Aug 2008 14:29:51 -0000 1.2 @@ -0,0 +1 @@ +gpac-20080217.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/gpac/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:51:02 -0000 1.1 +++ sources 3 Aug 2008 14:29:51 -0000 1.2 @@ -0,0 +1 @@ +dd56cf8f1ffe3431813ec3954b93b31d gpac-20080217.tar.bz2

16 years, 3 months

1
0
0 / 0

rpms/gltron/devel gltron-0.70-gcc.patch, NONE, 1.1 gltron.desktop, NONE, 1.1 gltron.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

by Thorsten Leemhuis

Author: thl Update of /cvs/free/rpms/gltron/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv20755 Modified Files: .cvsignore sources Added Files: gltron-0.70-gcc.patch gltron.desktop gltron.spec Log Message: initial import from livna gltron-0.70-gcc.patch: --- NEW FILE gltron-0.70-gcc.patch --- --- nebu/include/scripting/nebu_scripting.h~ 2006-11-26 07:04:10.000000000 -0800 +++ nebu/include/scripting/nebu_scripting.h 2006-11-26 07:04:19.000000000 -0800 @@ -18,9 +18,9 @@ extern int scripting_CopyStringResult(char *s, int len); -extern void scripting_RunFile(const char *name); -extern void scripting_Run(const char *command); -extern void scripting_RunFormat(const char *format, ...); +extern void scripting_RunFile(char *name); +extern void scripting_Run(char *command); +extern void scripting_RunFormat(char *format, ...); extern void scripting_RunGC(); extern void scripting_Register(const char *name, int(*func) (lua_State *L)); --- NEW FILE gltron.desktop --- [Desktop Entry] Name=GLTron Comment=A game inspired by the movie TRON Exec=gltron Icon=gltron.png Terminal=false Type=Application Encoding=UTF-8 Categories=Application;Game;ArcadeGame; --- NEW FILE gltron.spec --- Name: gltron Version: 0.70 Release: 3%{?dist} Summary: A 3D game inspired by the movie TRON Group: Amusements/Games License: GPL URL: http://gltron.org Source0: http://dl.sf.net/gltron/gltron-0.70-source.tar.gz Source1: %{name}.desktop Source2: %{name}.png Patch0: gltron-0.70-gcc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_sound-devel libpng-devel zlib-devel libGLU-devel BuildRequires: desktop-file-utils %description %{summary}. %prep %setup -q %patch -p0 -b .gcc~ %build %configure --disable-warn make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/pixmaps desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \ --vendor livna --mode=0644 --add-category=X-Livna %{SOURCE1} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING ChangeLog README %{_bindir}/* %{_datadir}/%{name} %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/*.png %changelog * Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.70-3 - rebuild * Sun Nov 26 2006 Christopher Stone <chris.stone(a)gmail.com> 0.70-2 - Remove more unneeded BuildRequires * Sun Nov 26 2006 Christopher Stone <chris.stone(a)gmail.com> 0.70-1 - Upstream sync - Fix License tag - Remove punctuation from Summary tag - Remove unnecessary BR - Some minor cleanups to spec file - Remove CFLAGS patch - Add --disable-warn to %%configure - Add a gcc compile patch * Sat Mar 25 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.70.0.3.beta.1 - fix BR * Wed Mar 22 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.70.0.2.beta.1 - remove epoch - fix release line * Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - add dist * Wed Nov 19 2003 Panu Matilainen <pmatilai(a)welho.com> 0.70-0.lvn.0.1.beta.1 - oops, release tag not right... * Fri Nov 14 2003 Panu Matilainen <pmatilai(a)welho.com> 0.70-0.lvn.0.beta.1 - patch to honor RPM_OPT_FLAGS and remove -Werror causing build to fail * Thu Nov 13 2003 Panu Matilainen <pmatilai(a)welho.com> - Initial livna.org packaging. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/gltron/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 16:50:46 -0000 1.1 +++ .cvsignore 3 Aug 2008 14:27:34 -0000 1.2 @@ -0,0 +1,2 @@ +gltron-0.70-source.tar.gz +gltron.png Index: sources =================================================================== RCS file: /cvs/free/rpms/gltron/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:50:46 -0000 1.1 +++ sources 3 Aug 2008 14:27:34 -0000 1.2 @@ -0,0 +1,2 @@ +300e54914844f36c199415d6d8b0372a gltron-0.70-source.tar.gz +54a0506b072b38a0fdfb1718cecf97aa gltron.png

16 years, 3 months

1
0
0 / 0

rpms/ffmpeg/devel ffmpeg-asmreg.patch, NONE, 1.1 ffmpeg-snapshot.sh, NONE, 1.1 ffmpeg.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

by Thorsten Leemhuis

Author: thl Update of /cvs/free/rpms/ffmpeg/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv20629 Modified Files: .cvsignore sources Added Files: ffmpeg-asmreg.patch ffmpeg-snapshot.sh ffmpeg.spec Log Message: initial import from livna ffmpeg-asmreg.patch: --- NEW FILE ffmpeg-asmreg.patch --- diff -up ffmpeg-20080614/libavcodec/Makefile.asmreg ffmpeg-20080614/libavcodec/Makefile --- ffmpeg-20080614/libavcodec/Makefile.asmreg 2008-06-08 23:08:57.000000000 +0200 +++ ffmpeg-20080614/libavcodec/Makefile 2008-06-14 17:24:58.000000000 +0200 @@ -87,6 +87,11 @@ OBJS-$(CONFIG_H263I_DECODER) + OBJS-$(CONFIG_H263_ENCODER) += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o OBJS-$(CONFIG_H263P_ENCODER) += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o OBJS-$(CONFIG_H264_DECODER) += h264.o h264idct.o h264pred.o h264_parser.o cabac.o golomb.o mpegvideo.o error_resilience.o +# to "fix" can't find a register in class 'GENERAL_REGS' while reloading 'asm' +# on ix86 in cabac.h +ifeq ($(ARCH_X86_32),yes) +h264.o: CFLAGS += -fomit-frame-pointer +endif OBJS-$(CONFIG_H264_ENCODER) += h264enc.o h264dspenc.o OBJS-$(CONFIG_HUFFYUV_DECODER) += huffyuv.o OBJS-$(CONFIG_HUFFYUV_ENCODER) += huffyuv.o @@ -391,6 +396,11 @@ OBJS-$(CONFIG_ENCODERS) + OBJS-$(CONFIG_CAVS_DECODER) += i386/cavsdsp_mmx.o OBJS-$(CONFIG_FLAC_ENCODER) += i386/flacdsp_mmx.o OBJS-$(CONFIG_SNOW_DECODER) += i386/snowdsp_mmx.o +# to "fix" can't find a register in class 'GENERAL_REGS' while reloading 'asm' +# on ix86 in snowdsp_mmx.c +ifeq ($(ARCH_X86_32),yes) +i386/snowdsp_mmx.o: CFLAGS += -fomit-frame-pointer +endif OBJS-$(CONFIG_VC1_DECODER) += i386/vc1dsp_mmx.o OBJS-$(CONFIG_VP3_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o OBJS-$(CONFIG_VP5_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o --- NEW FILE ffmpeg-snapshot.sh --- #!/bin/bash set -e tmp=$(mktemp -d) trap cleanup EXIT cleanup() { set +e [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp" } unset CDPATH pwd=$(pwd) svn=$(date +%Y%m%d) cd "$tmp" svn checkout -r {$svn} svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg-$svn cd ffmpeg-$svn ./version.sh . find . -type d -name .svn -print0 | xargs -0r rm -rf sed -i -e '/^\.PHONY: version\.h$/d' Makefile cd .. tar jcf "$pwd"/ffmpeg-$svn.tar.bz2 ffmpeg-$svn cd - >/dev/null --- NEW FILE ffmpeg.spec --- # TODO: add make test to %%check section %define svn 20080614 %define faad2min 1:2.6.1 Summary: Digital VCR and streaming server Name: ffmpeg Version: 0.4.9 Release: 0.47.%{svn}%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://ffmpeg.org/ Source0: http://rpm.greysector.net/livna/%{name}-%{svn}.tar.bz2 Source1: %{name}-snapshot.sh Patch4: %{name}-asmreg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: a52dec-devel %{?_with_amr:BuildRequires: amrnb-devel amrwb-devel} BuildRequires: zlib-devel BuildRequires: lame-devel BuildRequires: libdc1394-devel BuildRequires: libvorbis-devel BuildRequires: libtheora-devel BuildRequires: faad2-devel >= %{faad2min} BuildRequires: xvidcore-devel BuildRequires: SDL-devel BuildRequires: gsm-devel BuildRequires: imlib2-devel BuildRequires: texi2html BuildRequires: faac-devel BuildRequires: x264-devel >= 0.0.0-0.14.20080613 %description FFMpeg is a complete and free Internet live audio and video broadcasting solution for Linux/Unix. It also includes a digital VCR. It can encode in real time in many formats including MPEG1 audio and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash. %package libs Summary: Libraries for %{name} Group: System Environment/Libraries Requires: faad2-libs >= %{faad2min} %description libs FFMpeg is a complete and free Internet live audio and video broadcasting solution for Linux/Unix. It also includes a digital VCR. It can encode in real time in many formats including MPEG1 audio and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash. This package contains the libraries for %{name} %package devel Summary: Development package for %{name} Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} Requires: pkgconfig %description devel FFMpeg is a complete and free Internet live audio and video broadcasting solution for Linux/Unix. It also includes a digital VCR. It can encode in real time in many formats including MPEG1 audio and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash. This package contains development files for %{name} %prep %setup -q -n %{name}-%{svn} %patch4 -p1 -b .asmreg %build ./configure \ --prefix=%{_prefix} \ --incdir=%{_includedir}/ffmpeg \ --libdir=%{_libdir} \ --shlibdir=%{_libdir} \ --mandir=%{_mandir} \ --arch=%{_target_cpu} \ --extra-cflags="$RPM_OPT_FLAGS" \ %{?_with_amr:--enable-libamr-nb --enable-libamr-wb} \ --enable-libdc1394 \ --enable-liba52 \ --enable-libfaac \ --enable-libfaad \ --enable-libgsm \ --enable-libmp3lame \ --enable-libtheora \ --enable-libvorbis \ --enable-libx264 \ --enable-libxvid \ --enable-postproc \ --enable-swscale \ --enable-pthreads \ --disable-static \ --enable-shared \ --enable-gpl \ --disable-debug \ --disable-optimizations \ --disable-stripping make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT __doc make install DESTDIR=$RPM_BUILD_ROOT cp -a doc __doc rm -f __doc/{Makefile,*.{1,pl,texi}} %clean rm -rf $RPM_BUILD_ROOT %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc COPYING.GPL CREDITS Changelog README __doc/*.* # Note: as of 20070204, "configure" doesn't have --bindir. %{_prefix}/bin/ffmpeg %{_prefix}/bin/ffplay %{_prefix}/bin/ffserver %{_mandir}/man1/ffmpeg.1* %{_mandir}/man1/ffplay.1* %{_mandir}/man1/ffserver.1* %files libs %defattr(-,root,root,-) %{_libdir}/libavcodec.so.* %{_libdir}/libavdevice.so.* %{_libdir}/libavformat.so.* %{_libdir}/libavutil.so.* %{_libdir}/libpostproc.so.* %{_libdir}/libswscale.so.* %{_libdir}/vhook/ %files devel %defattr(-,root,root,-) # Note: as of 20070204, --incdir doesn't affect postproc. %{_includedir}/ffmpeg %{_libdir}/libavcodec.so %{_libdir}/libavdevice.so %{_libdir}/libavformat.so %{_libdir}/libavutil.so %{_libdir}/libpostproc.so %{_libdir}/libswscale.so %{_libdir}/pkgconfig/libswscale.pc %{_libdir}/pkgconfig/libavcodec.pc %{_libdir}/pkgconfig/libavdevice.pc %{_libdir}/pkgconfig/libavformat.pc %{_libdir}/pkgconfig/libavutil.pc %{_libdir}/pkgconfig/libpostproc.pc %changelog * Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.4.9-0.47.20080614 - rebuild * Sat Jun 14 2008 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.46.20080614 - 20080614 snapshot - no need to conditionalize swscaler anymore - dropped obsolete pkgconfig patch - BR latest x264 * Mon Mar 03 2008 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.45.20080113 - rebuild for new x264 * Sun Jan 13 2008 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.44.20080113 - 20080113 snapshot - drop unnecessary patch - enable libdc1394 support - enable swscaler * Mon Nov 12 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.43.20071111 - ensure that we use the correct faad2 version * Sun Nov 11 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.42.20071111 - 20071111 snapshot - current faad2 is good again * Thu Oct 18 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.41.20071011 - fix BRs and Requires for faad2 * Thu Oct 11 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.40.20071011 - 20071011 snapshot - don't link against faad2-2.5, it makes GPL'd binary non-distributable - go back to normal linking instead of dlopen() of liba52 * Sun Sep 23 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.39.20070923 - 20070923 snapshot - use faad2 2.5 - optional AMR support - dropped obsolete patch * Thu Jun 07 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.38.20070607 - 20070607 snapshot - libdca BR dropped (no longer supported) - drop gsm.h path hack, gsm in Fedora now provides a compatibility symlink - remove arch hacks, ffmpeg's configure is smart enough - enable cmov on x86_64 * Thu May 03 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.37.20070503 - require older faad2 to prevent bugreports like #1388 - prepare for libdc1394 support - enable pthreads - 20070503 snapshot * Thu Feb 08 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.35.20070204 - libswscale.pc is necessary regardless of --enable-swscaler * Sun Feb 4 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.4.9-0.34.20070204 - 2007-02-04 snapshot, enable libtheora. - Make swscaler optional, disabled again by default (#1379). * Fri Jan 05 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.34.20061214 - move vhooks to -libs * Wed Jan 03 2007 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.33.20061214 - split -libs subpackage for multilib installs * Tue Dec 26 2006 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.32.20061214 - new kino works with swscaler, re-enabled * Tue Dec 19 2006 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.31.20061214 - disable swscaler, it breaks kino * Sun Dec 17 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.4.9-0.30.20061214 - fix pkgconfig patch * Sat Dec 16 2006 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.29.20061214 - liba52 change broke build on 64bit - resurrect lost URL changes * Fri Dec 15 2006 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.28.20061214 - fixed build on x86 - change liba52 file-based dependency to provides-based - resurrect and update pkgconfig patch * Thu Dec 14 2006 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.27.20061214 - new snapshot URL - new URL * Thu Dec 14 2006 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.26.20061214 - 2006-12-14 snapshot - added libdca support - enabled swscaler - dropped obsolete patches * Mon Oct 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.4.9-0.25.20061030 - 2006-10-30 snapshot, fixes x86_64 build. - Apply a less intrusive workaround for LAME detection issues. * Sat Oct 28 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.4.9-0.25.20061028 - 2006-10-28 snapshot, build with x264. - Clean up some pre-FC4 compat build dependency cruft. - Quick and dirty workarounds for ./configure's libmp3lame test and asm register issues on ix86. * Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.4.9-25 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 * Tue Sep 26 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.4.9-0.24.20060817 - Drop SELinux fcontext settings, they're supposedly fixed upstream again. * Thu Aug 17 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.4.9-0.23.20060817 - 2006-08-17 snapshot. - Fix svn rev in "ffmpeg -version" etc. * Wed Aug 9 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.4.9-0.23.20060804 - Reintroduce SELinux fcontext settings on ix86 (not needed on x86_64, ppc), they're not completely taken care of upstream (#1120). - Split svn snapshot creator into a separate script. * Fri Aug 4 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.4.9-0.22.20060804 - 2006-08-04 snapshot. - Drop bogus version from SDL-devel build dependency. - Drop no longer relevant libpostproc obsoletion. - Prune pre-2005 changelog entries. - Specfile cleanup. * Sat Jun 17 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.4.9-0.22.20060617 - 2006-06-17 snapshot. * Mon Jun 12 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.4.9-0.22.20060612 - 2006-06-12 snapshot, rgb.txt patch applied upstream. - Patch to force linking vhook modules with their dependencies, --as-needed seems to drop needed things for some reason for drawtext and imlib2. - Revert to dlopen()'ing liba52 and add file based dependency on it, it's easier this way again due to --as-needed linkage. * Wed May 17 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.4.9-0.22.20060517 - 2006-05-17 snapshot. - Link with faad2, don't dlopen() it. * Sat May 13 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.4.9-0.22.20060513 - 2006-05-13 snapshot. - Drop SELinux fixups, they're part of upstream policy now. * Sat Apr 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.4.9-0.22.20060407 - SELinux file context fixups (mplayer, vdr-dxr3 etc) while waiting for #188358 * Sat Apr 8 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.4.9-0.21.20060407 - 2006-04-07 CVS snapshot. - Move *.so to -devel, hopefully nothing needs them any more. * Fri Mar 31 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.4.9-0.21.20051228 - Remove superfluous dependencies from pkgconfig files (#747). - Re-enable MMX on x86_64. * Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - switch to new release field * Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - add dist * Wed Dec 28 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.4.9-0.lvn.0.20.20051228 - 2005-12-28 CVS snapshot. - Let upstream configure take care of PIC settings (patched for ppc). - Own shared lib symlinks. * Fri Dec 23 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.4.9-0.lvn.0.20.20050801 - Apply upstream fix for CVE-2005-4048. - Patch to find rgb.txt in FC5 too. * Thu Sep 29 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.9-0.lvn.0.19.20050801 - Clean up obsolete pre-FC3 stuff (FAAC is now unconditionally enabled). - Drop zero Epochs. * Tue Aug 16 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.9-0.lvn.0.18.20050801 - Apply some upstream and some mine (libdir) fixes to pkgconfig files. - Add pkgconfig dependency to -devel. - Include gsm support. * Thu Aug 4 2005 David Woodhouse <dwmw2(a)infradead.org> - 0:0.4.9-0.lvn.0.17.20050801 - Update to 20050801 snapshot to make xine-lib happy - Enable Altivec support by using --cpu=powerpc (not 'ppc') - Enable theora - Add pkgconfig files - Undefine various things which might be macros before redefining them * Sat Jul 23 2005 Dams <anvil[AT]livna.org> - 0:0.4.9-0.lvn.0.17.20050427 - Added patch from Marc Deslauriers to fix wmv2 distorsion * Sun Jul 10 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.9-0.lvn.0.16.20050427 - Enable faac by default, rebuild with "--without faac" to disable. - Clean up obsolete pre-FC2 and other stuff. * Sun May 22 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.9-0.lvn.0.15.20050427 - PPC needs -fPIC too. * Sat May 21 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0:0.4.9-0.lvn.0.14.20050427 - disable mmx for now on x86_64 to fix build * Sat Apr 30 2005 Dams <anvil[AT]livna.org> - 0:0.4.9-0.lvn.0.13.20050427 - Removed bogus devel requires - Re-added conditionnal a52dec buildreq * Fri Apr 29 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.9-0.lvn.0.12.20050427 - Link avcodec with a52 when building with a52bin, remove unnecessary hardcoded liba52.so.0 dependency. * Fri Apr 29 2005 Dams <anvil[AT]livna.org> - 0:0.4.9-0.lvn.0.11.20050427 - Fixed devel package deps * Fri Apr 29 2005 Dams <anvil[AT]livna.org> - 0:0.4.9-0.lvn.0.10.20050427 - texi2html replaces tetex as build dependency (FC4 compliance) - re-added man pages * Thu Apr 28 2005 Dams <anvil[AT]livna.org> - 0:0.4.9-0.lvn.0.9.20050427 - Patch from Enrico to fix build on gcc4 - Missing BuildReq a52dec-devel when a52bin is defined - Patch to fix a52 build * Wed Apr 27 2005 Dams <anvil[AT]livna.org> - 0:0.4.9-0.lvn.0.8.20050427 - Updated tarball to cvs 20050427 snapshot - Enabled libogg, xvid, a52bin - Dropped Patch[0-3] Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/ffmpeg/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 16:50:06 -0000 1.1 +++ .cvsignore 3 Aug 2008 14:25:41 -0000 1.2 @@ -0,0 +1 @@ +ffmpeg-20080614.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/ffmpeg/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:50:06 -0000 1.1 +++ sources 3 Aug 2008 14:25:41 -0000 1.2 @@ -0,0 +1 @@ +322a5f53e33b5b4f312ed798d14c6ced ffmpeg-20080614.tar.bz2

16 years, 3 months

1
0
0 / 0

rpms/faad2/devel faad2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

by Thorsten Leemhuis

Author: thl Update of /cvs/free/rpms/faad2/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv20167 Modified Files: .cvsignore sources Added Files: faad2.spec Log Message: initial import from livna --- NEW FILE faad2.spec --- %{?el4:%define _without_sysfs 1} %{?fc3:%define _without_sysfs 1} %{?fc2:%define _without_sysfs 1} %{?fc1:%define _without_sysfs 1} %{?el3:%define _without_sysfs 1} %{?rh9:%define _without_sysfs 1} %{?rh7:%define _without_sysfs 1} %{?el2:%define _without_sysfs 1} %define xmmsinputplugindir %(xmms-config --input-plugin-dir 2>/dev/null) Summary: Library and frontend for decoding MPEG2/4 AAC Name: faad2 Epoch: 1 Version: 2.6.1 Release: 4%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.audiocoding.com/faad2.html Source: http://download.sourceforge.net/faac/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: gcc-c++ BuildRequires: id3lib-devel %{!?_without_sysfs:BuildRequires: libsysfs-devel} BuildRequires: libtool BuildRequires: xmms-devel BuildRequires: zlib-devel %description FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely written from scratch. %package libs Summary: Shared libraries of the FAAD 2 AAC decoder Group: System Environment/Libraries Obsoletes: %{name} < 1:2.6.1-3 %description libs FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely written from scratch. This package contains libfaad. %package devel Summary: Development libraries of the FAAD 2 AAC decoder Group: Development/Libraries Requires: %{name}-libs = %{epoch}:%{version}-%{release} %description devel FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely written from scratch. This package contains development files and documentation for libfaad. %package -n xmms-%{name} Summary: AAC XMMS Input Plugin Group: Applications/Multimedia Requires: %{name} = %{epoch}:%{version}-%{release} Provides: xmms-aac = %{version}-%{release} %description -n xmms-%{name} FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely written from scratch. This package contains an input plugin for xmms. %prep %setup -q -n %{name} find . -name "*.c" -o -name "*.h" | xargs chmod 644 for f in AUTHORS COPYING ChangeLog NEWS README* TODO ; do tr -d '\r' <$f >$f.n && mv -f $f.n $f done %build # This is what the README.linux file recommends autoreconf -vif %configure \ --disable-static \ --with-xmms \ # --with-drm %{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} %{__make} install DESTDIR=%{buildroot} %{__rm} %{buildroot}%{_libdir}/libfaad.la %{__rm} %{buildroot}%{xmmsinputplugindir}/libmp4.la %clean %{__rm} -rf %{buildroot} %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig %files %defattr(-, root, root, -) %doc AUTHORS COPYING ChangeLog NEWS README* TODO %{_bindir}/faad %files libs %defattr(-,root,root,-) %{_libdir}/libfaad.so.* %files devel %defattr(-, root, root, -) %{_includedir}/faad.h %{_includedir}/neaacdec.h %{_libdir}/libfaad.so %files -n xmms-%{name} %defattr(-,root,root,-) %doc plugins/xmms/AUTHORS plugins/xmms/NEWS %{xmmsinputplugindir}/libmp4.so %changelog * Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1:2.6.1-4 - rebuild * Sun Jan 13 2008 Dominik Mierzejewski <dominik [AT] greysector [DOT] net> 1:2.6.1-3 - split off libs to avoid multilib conflicts * Sun Nov 11 2007 Dominik Mierzejewski <dominik [AT] greysector [DOT] net> 1:2.6.1-2 - bring back the XMMS plugin - move EOL fixup to prep - fix URLs * Thu Nov 01 2007 Dominik Mierzejewski <dominik [AT] greysector [DOT] net> 1:2.6.1-1 - remerge freshrpms specfile - update to latest upstream, fixes licensing issues! * Thu Oct 18 2007 Dominik Mierzejewski <dominik [AT] greysector [DOT] net> 1:2.0-21 - fix missing epochs in dependencies * Tue Oct 16 2007 Dominik Mierzejewski <dominik [AT] greysector [DOT] net> 1:2.0-20 - revert from 2.5 * Wed Sep 26 2007 Dominik Mierzejewski <dominik [AT] greysector [DOT] net> 2.5-4 - disable drm, fixes playback of many AAC streams (bug #1465) * Sun Sep 23 2007 Dominik Mierzejewski <dominik [AT] greysector [DOT] net> 2.5-3 - remove redundant BRs - don't disable backward compatibility (breaks ffmpeg) - silence tar in setup - use disttag - fix source file permissions and other rpmlint warnings * Sat Sep 15 2007 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 2.5-2 - import faad2 from freshrpms as discussed on on repomerge-list * Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 2.0-19 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 * Tue Sep 26 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.0-18.20050131 - Rebuild. * Sat Jun 17 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.0-17.20050131 - Let soname based autogenerated deps take care of xmms-libs (#1018). - Revert x86_64 patch to the correct one again (#1017). * Thu Jun 15 2006 Noa Resare <noa(a)resare.com> - 2.0-16.20050131 - reverted to obviously broken x86_64 patch to preserve binary compatibility and prevent slow motion bug (#1017) - fixed xmms-libs regression (#1018) * Wed May 24 2006 Noa Resare <noa(a)resare.com> - 2.0-15.20050131 - added patch to fix apple trailer playback problem * Tue May 23 2006 Noa Resare <noa(a)resare.com> - 2.0-14.20050131 - reverted to older cvs to avoid a GPL violating extra redistribution requirement in README - changed the bogus uint8_t to correct uin32_t in the x86_64 patch * Sun May 21 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.0-13.20060505 - Avoid aclocal >= 1.8 warnings. * Sun May 21 2006 Noa Resare <noa(a)resare.com> - 2.0-12.20060505 - re-introduce the x86_64 patch to restore binary compatibility * Sat May 20 2006 Noa Resare <noa(a)resare.com> - 2.0-10.20060505 - patch the sources to be binary compatible with old faad2 - remove library major version bump - add symbol versioning script for new symbols * Fri May 05 2006 Noa Resare <noa(a)resare.com> - 2.0-9.20060505 - upgrade to cvs version - mp4v2 is no longer included (now a separate package) - bump libary major version - drop static library - remove mp4ff headers from -devel * Mon Mar 13 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 2.0-8 - Drop Epoch completely * Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - switch to new release field * Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - add dist * Tue Jan 17 2006 Adrian Reber <adrian(a)lisas.de> - 2.0-0.lvn.7 - Removed change of ownership to root:root during %%install - Droped Epoch * Sat Oct 01 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info - 0:2.0-0.lvn.6 - Add faad2-amd64.patch to fix #510 * Wed Jun 15 2005 Ricahrd June <rjune[AT]bravegnuworld.com> - 0:2.0-0.lvn.5 - Included some hand install lines because make install did not place some required header files * Wed Apr 27 2005 Dams <anvil[AT]livna.org> - 0:2.0-0.lvn.4 - Fixed gcc4 build * Fri Nov 12 2004 Dams <anvil[AT]livna.org> 0:2.0-0.lvn.3 - Fixing gcc34 build * Wed Oct 13 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:2.0-0.lvn.2 - libsndfile is no longer required since 2.0rc1. * Wed Mar 10 2004 Dams <anvil[AT]livna.org> 0:2.0-0.lvn.1 - Updated to 2.0 final release - Added missing defattr - Added xmms-aac provides to xmms-{name} - Fixed makefile (patch) * Sun Sep 28 2003 Dams <anvil[AT]livna.org> 0:2.0-0.fdr.0.1.rc1 - Updated to 2.0 rc1 - Added xmms-faad2 subpackage * Sun Sep 28 2003 Dams <anvil[AT]livna.org> 0:1.1-0.fdr.4 - Added missing scriplets - buildroot -> RPM_BUILD_ROOT * Tue Apr 15 2003 Dams <anvil[AT]livna.org> 0:1.1-0.fdr.3 - turned bootstrap into ./bootstrap to prevent build to fail with people who dont have "." in their PATH. * Sat Apr 12 2003 Dams <anvil[AT]livna.org> 0:1.1-0.fdr.2 - Typo in devel Requires. * Sat Apr 12 2003 Dams <anvil[AT]livna.org> - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/faad2/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 16:49:58 -0000 1.1 +++ .cvsignore 3 Aug 2008 14:20:19 -0000 1.2 @@ -0,0 +1 @@ +faad2-2.6.1.tar.gz Index: sources =================================================================== RCS file: /cvs/free/rpms/faad2/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:49:58 -0000 1.1 +++ sources 3 Aug 2008 14:20:19 -0000 1.2 @@ -0,0 +1 @@ +74e92df40c270f216a8305fc87603c8a faad2-2.6.1.tar.gz

16 years, 3 months

1
0
0 / 0

rpms/dvdstyler/devel dvdstyler-1.5.1-desktop.patch, NONE, 1.1 dvdstyler.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

by Thorsten Leemhuis

Author: thl Update of /cvs/free/rpms/dvdstyler/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv19736 Modified Files: .cvsignore sources Added Files: dvdstyler-1.5.1-desktop.patch dvdstyler.spec Log Message: initial import from livna dvdstyler-1.5.1-desktop.patch: --- NEW FILE dvdstyler-1.5.1-desktop.patch --- --- DVDStyler-1.5.1/data/dvdstyler.desktop~ 2007-06-13 08:55:19.000000000 +0300 +++ DVDStyler-1.5.1/data/dvdstyler.desktop 2007-07-08 22:43:02.000000000 +0300 @@ -1,11 +1,11 @@ [Desktop Entry] Version=1.0 Type=Application -Encoding=iso-8859-1 Name=DVD Styler Comment=Video DVD Production -Icon=dvdstyler.png +Icon=dvdstyler Exec=dvdstyler Terminal=false -Categories=Application;AudioVideo +Categories=AudioVideo; StartupNotify=true +StartupWMClass=Dvdstyler --- NEW FILE dvdstyler.spec --- Name: dvdstyler Version: 1.5.1 Release: 3%{?dist} Epoch: 1 Summary: Cross-platform DVD authoring system Group: Applications/Multimedia License: GPL+ URL: http://www.dvdstyler.de/ Source0: http://downloads.sourceforge.net/dvdstyler/DVDStyler-%{version}.tar.gz Patch0: %{name}-1.5.1-desktop.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: wxGTK-devel >= 2.6.3 BuildRequires: wxsvg-devel BuildRequires: gettext BuildRequires: mpgtx BuildRequires: netpbm-progs BuildRequires: mjpegtools BuildRequires: dvdauthor BuildRequires: mkisofs BuildRequires: dvd+rw-tools BuildRequires: libgnomeui-devel BuildRequires: libjpeg-devel BuildRequires: desktop-file-utils Requires: mpgtx Requires: netpbm-progs Requires: mjpegtools Requires: dvdauthor Requires: mkisofs Requires: dvd+rw-tools # Optional, defaults to off in burn settings in 1.5.1 Requires(hint): dvdisaster # This is not strictly true, but it's the default previewer, and mplayer # doesn't support DVD menus, so... Requires: xine %description DVDStyler is a cross-platform DVD menu creation GUI that allows creation of DVD navigation menus similar to those found on most commercial DVD's. It leverages various other open source video rendering programs to produce the final DVD menu navigation system. %prep %setup -q -n DVDStyler-%{version} %patch0 -p1 # Q'n'd fix for configure/Makefile.in outdatedness in 1.5.1: (echo all: ; echo install:) > install.win32/Makefile.in %build %configure --disable-dependency-tracking make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/dvdstyler # Desktop entry and icon are supposed to be installed by "make install" # in 1.5.1 (to paths we don't want) but are not due to configure/Makefile.in # and friends outdatedness, watch this space in > 1.5.1. desktop-file-install --vendor livna --mode 644 \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ data/dvdstyler.desktop install -Dpm 644 data/dvdstyler.png \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/dvdstyler.png %find_lang %{name} %post touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ] ; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ] ; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README TODO %{_bindir}/dvdstyler %{_datadir}/dvdstyler/ %{_datadir}/applications/*dvdstyler.desktop %{_datadir}/icons/hicolor/*x*/apps/dvdstyler.png %changelog * Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1:1.5.1-3 - rebuild * Wed Aug 22 2007 Ville Skyttä <ville.skytta at iki.fi> - 1:1.5.1-2 - License: GPL+ - Sync icon cache scriptlets with Fedora Wiki. * Mon Jul 9 2007 Ville Skyttä <ville.skytta at iki.fi> - 1:1.5.1-1 - 1.5.1. * Fri Jun 8 2007 Ville Skyttä <ville.skytta at iki.fi> - 1:1.5-1 - 1.5. * Fri May 25 2007 Ville Skyttä <ville.skytta at iki.fi> - 1:1.4-8 - Rebuild. * Tue Feb 6 2007 Ville Skyttä <ville.skytta at iki.fi> - 1:1.4-7 - Patch for wxWidgets 2.8. * Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 1.4-6 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 * Mon Sep 25 2006 Ville Skyttä <ville.skytta at iki.fi> - 1:1.4-5 - Rebuild. * Sun Apr 9 2006 Ville Skyttä <ville.skytta at iki.fi> - 1:1.4-4 - Actually apply the y4mscaler patch (#904). Note that for the change to take effect, old Jpeg2MpegCmd setting may need to be removed from ~/.dvdstyler. - Install icon to %%{_datadir}/icons/hicolor. * Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - switch to new release field * Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - add dist * Mon Jun 06 2005 Thorsten Leemhuis <fedora at leemhuis.info> - 1:1.4-0.lvn.3 - Add gcc4-x86_64.patch to fix compile on x86_64 * Sun May 22 2005 Ville Skyttä <ville.skytta at iki.fi> - 1:1.4-0.lvn.2 - Patch default config to use y4mscaler and require it due to changes in mjpegtools 1.7.0. * Wed May 18 2005 Ville Skyttä <ville.skytta at iki.fi> - 1:1.4-0.lvn.1 - 1.4, desktop entry patch applied upstream. - Patch to fix about dialog crash. * Sun Jan 30 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.31-0.lvn.1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/dvdstyler/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 16:49:42 -0000 1.1 +++ .cvsignore 3 Aug 2008 14:16:15 -0000 1.2 @@ -0,0 +1 @@ +DVDStyler-1.5.1.tar.gz Index: sources =================================================================== RCS file: /cvs/free/rpms/dvdstyler/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:49:42 -0000 1.1 +++ sources 3 Aug 2008 14:16:15 -0000 1.2 @@ -0,0 +1 @@ +8b683353b4a9db18d56cb0ddcb78d35e DVDStyler-1.5.1.tar.gz

16 years, 3 months

1
0
0 / 0

rpms/comical/devel comical-0.8-jpe.patch, NONE, 1.1 comical-0.8-optflags.patch, NONE, 1.1 comical.desktop, NONE, 1.1 comical.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

by Thorsten Leemhuis

Author: thl Update of /cvs/free/rpms/comical/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv19306 Modified Files: .cvsignore sources Added Files: comical-0.8-jpe.patch comical-0.8-optflags.patch comical.desktop comical.spec Log Message: initial import from livna comical-0.8-jpe.patch: --- NEW FILE comical-0.8-jpe.patch --- --- comical-0.8/src/ComicBookZIP.cpp.BAD 2006-04-24 20:41:07.000000000 -0500 +++ comical-0.8/src/ComicBookZIP.cpp 2006-04-24 20:41:30.000000000 -0500 @@ -54,7 +54,7 @@ do { unzGetCurrentFileInfo(ZipFile, fileInfo, namebuf, 1024, NULL, 0, NULL, 0); page = wxString::FromAscii(namebuf); - if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") || + if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") || page.Right(4).Upper() == wxT(".JPE") || page.Right(4).Upper() == wxT(".GIF") || page.Right(4).Upper() == wxT(".PNG")) Filenames->Add(page); --- comical-0.8/src/ComicBookRAR.cpp.BAD 2006-04-24 20:41:56.000000000 -0500 +++ comical-0.8/src/ComicBookRAR.cpp 2006-04-24 20:42:15.000000000 -0500 @@ -67,7 +67,7 @@ #else page = wxString(header.FileName); #endif - if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") || + if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") || page.Right(4).Upper() == wxT(".JPE") || page.Right(4).Upper() == wxT(".GIF") || page.Right(4).Upper() == wxT(".PNG")) Filenames->Add(page); comical-0.8-optflags.patch: --- NEW FILE comical-0.8-optflags.patch --- --- comical-0.8/unrar/makefile.linux.BAD 2006-02-11 10:15:09.000000000 -0600 +++ comical-0.8/unrar/makefile.linux 2006-04-24 20:43:10.000000000 -0500 @@ -7,7 +7,7 @@ # Linux using GCC CXX=g++ -CXXFLAGS=-O2 -fPIC +CXXFLAGS=-O2 -fPIC $(RPM_OPT_FLAGS) DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE STRIP=strip AR=ar --- comical-0.8/src/Makefile.BAD 2006-04-24 20:44:53.000000000 -0500 +++ comical-0.8/src/Makefile 2006-04-24 20:45:04.000000000 -0500 @@ -1,5 +1,5 @@ INCLUDE = -I../unrar -I../unzip -CFLAGS = -O2 -Wall -pipe +CFLAGS = -O2 -Wall -pipe $(RPM_OPT_FLAGS) CPPFLAGS = `wx-config --cxxflags` $(CFLAGS) -D_UNIX $(INCLUDE) .SUFFIXES: .cpp .png .h .d .o --- NEW FILE comical.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Comical GenericName=Comic Archive Reader Comment=Open .cbr & .cbz files Exec=comical Icon=comical.png StartupNotify=false Terminal=false Type=Application Categories=Application;Graphics;X-Livna; Version=0.9.4 X-Desktop-File-Install-Version=0.4 --- NEW FILE comical.spec --- Name: comical Version: 0.8 Release: 5%{?dist} Summary: GUI comic book viewer License: GPLv2 Group: Applications/Multimedia URL: http://comical.sourceforge.net/ Source0: http://download.sourceforge.net/comical/comical-%{version}.tar.gz Source1: comical.png Source2: comical.desktop Patch0: comical-0.8-jpe.patch Patch1: comical-0.8-optflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: wxGTK2-devel BuildRequires: desktop-file-utils Requires: unzip %description Comical is a fully featured GUI comic book viewer using wxWidgets. It can view CBZ and CBR format files. %prep %setup -q %patch0 -p1 %patch1 -p1 %build make %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_bindir} install -m0755 comical $RPM_BUILD_ROOT%{_bindir} install -p -D -m0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png desktop-file-install --vendor livna \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Livna \ %{SOURCE2} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc AUTHORS COPYING README TODO %{_bindir}/comical %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/%{name}.png %changelog * Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.8-5 - rebuild * Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.8-4 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 * Tue Sep 26 2006 Andreas Thienemann <andreas(a)bawue.net> 0.8-3 - Bump for rebuild. * Mon Jul 31 2006 Andreas Thienemann <andreas(a)bawue.net> 0.8-2 - Import into livna due to libunrar licensing issues. - Bumped to 0.8-2 * Mon Apr 24 2006 Tom "spot" Callaway <tcallawa(a)redhat.com> 0.8-1 - bump for 0.8 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa(a)redhat.com> 0.7-2 - bump for FC5 * Thu Jan 5 2006 Tom "spot" Callaway <tcallawa(a)redhat.com> 0.7-1 - bump to 0.7 - disable all the sort patches, the 0.7 sort is no better than the original 0.4 sort, but they changed how they did it, so the old sort patches would have to be reworked... and I'm not motivated right now. * Sat Jun 4 2005 Tom "spot" Callaway <tcallawa(a)redhat.com> 0.4-9 - fix x86_64 by not using std::min * Fri Jun 3 2005 Tom "spot" Callaway <tcallawa(a)redhat.com> 0.4-8 - add dist tag * Sun Apr 10 2005 Tom "spot" Callaway <tcallawa(a)redhat.com> 0.4-7 - Support images that end in ".jpe". Most likely, .jpeg files that were truncated by saving/compressing. * Sat Apr 9 2005 Tom "spot" Callaway <tcallawa(a)redhat.com> 0.4-6 - Minor spec cleanups. * Sat Apr 9 2005 Tom "spot" Callaway <tcallawa(a)redhat.com> 0.4-5 - Enhance the sort algorithm to be more intelligent. * Mon Apr 4 2005 Tom "spot" Callaway <tcallawa(a)redhat.com> 0.4-4 - drop --with-gtk from configure, unused - backout "bracket" patch, it breaks if [ or ] are in the directory path * Mon Apr 4 2005 Tom "spot" Callaway <tcallawa(a)redhat.com> 0.4-3 - Add sort menu option to enable/disable sorting of images in archive - Add logo from Brian Pepple - Add desktop entry - Add patch to gracefully deal with the absence of unrar * Sun Apr 3 2005 Tom "spot" Callaway <tcallawa(a)redhat.com> 0.4-2 - patch for handling files with [ or ] in their names * Sun Apr 3 2005 Tom "spot" Callaway <tcallawa(a)redhat.com> 0.4-1 - inital package for Fedora Extras - CBR support only works with unrar, but we can't have that as a dep due to licensing issues with unrar. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/comical/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 16:48:22 -0000 1.1 +++ .cvsignore 3 Aug 2008 14:11:38 -0000 1.2 @@ -0,0 +1,2 @@ +comical-0.8.tar.gz +comical.png Index: sources =================================================================== RCS file: /cvs/free/rpms/comical/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:48:22 -0000 1.1 +++ sources 3 Aug 2008 14:11:38 -0000 1.2 @@ -0,0 +1,2 @@ +f5808e28fd5a2a3d21b59cdad10eca3d comical-0.8.tar.gz +7e38455e43a0bee5994caa3bd6b901bb comical.png

16 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpmfusion-commits August 2008