August 2008 - rpmfusion-commits

rpms/vdr-burn/devel vdr-burn-0.1.0-pre21-config.patch, NONE, 1.1 vdr-burn-0.1.0-pre21-finnish.patch, NONE, 1.1 vdr-burn-0.1.0-pre21-gcc43.patch, NONE, 1.1 vdr-burn-0.1.0-pre21-no-subtitles.patch, NONE, 1.1 vdr-burn-0.1.0-pre21-utf8.patch, NONE, 1.1 vdr-burn.conf, NONE, 1.1 vdr-burn.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

by Thorsten Leemhuis

Author: thl Update of /cvs/free/rpms/vdr-burn/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv21259 Modified Files: .cvsignore sources Added Files: vdr-burn-0.1.0-pre21-config.patch vdr-burn-0.1.0-pre21-finnish.patch vdr-burn-0.1.0-pre21-gcc43.patch vdr-burn-0.1.0-pre21-no-subtitles.patch vdr-burn-0.1.0-pre21-utf8.patch vdr-burn.conf vdr-burn.spec Log Message: initial import from livna vdr-burn-0.1.0-pre21-config.patch: --- NEW FILE vdr-burn-0.1.0-pre21-config.patch --- Index: Makefile =================================================================== RCS file: /var/cvsroot/burn/Makefile,v retrieving revision 1.23 diff -u -r1.23 Makefile --- Makefile 1 Oct 2006 21:26:44 -0000 1.23 +++ Makefile 12 Dec 2006 20:31:14 -0000 @@ -81,11 +81,11 @@ endif ifndef DVDDEV -DVDDEV=/dev/dvd +DVDDEV=/dev/dvdrw endif ifndef ISODIR -ISODIR=/pub/export +ISODIR=$(shell vdr-config --videodir) endif DEFINES += -DTMPDIR='"$(TMPDIR)"' -DDVDDEV='"$(DVDDEV)"' -DISODIR='"$(ISODIR)"' Index: README =================================================================== RCS file: /var/cvsroot/burn/README,v retrieving revision 1.11 diff -u -r1.11 README --- README 16 Sep 2006 19:37:54 -0000 1.11 +++ README 12 Dec 2006 20:31:14 -0000 @@ -92,7 +92,7 @@ 3b.(optional) Change the default temporary folder, the default DVD writer device and the default ISO directory with TMPDIR (default: /tmp), - DVDDEV (default: /dev/dvd) and ISODIR (default: /pub/export) + DVDDEV (default: /dev/dvdrw) and ISODIR (default: video dir) vdr-1.4.2 # make DVDDEV=/dev/cdrecorder ISODIR=/export plugins Index: chain-archive.c =================================================================== RCS file: /var/cvsroot/burn/chain-archive.c,v retrieving revision 1.13 diff -u -r1.13 chain-archive.c --- chain-archive.c 16 Sep 2006 18:33:36 -0000 1.13 +++ chain-archive.c 12 Dec 2006 20:31:14 -0000 @@ -64,7 +64,7 @@ bind( &recording::get_graft_point, _2 ), " " ))); - graftPoints = format("{0} /dvd.vdr={1}/counters/standard") % graftPoints % plugin::get_config_path(); + graftPoints = format("{0} /dvd.vdr=/var/lib/vdr/burn/counters/standard") % graftPoints; switch (get_job().get_store_mode()) { case storemode_create: Index: jobs.c =================================================================== RCS file: /var/cvsroot/burn/jobs.c,v retrieving revision 1.35 diff -u -r1.35 jobs.c --- jobs.c 1 Oct 2006 21:22:27 -0000 1.35 +++ jobs.c 12 Dec 2006 20:31:14 -0000 @@ -389,7 +389,7 @@ std::string job::get_archive_id() { std::string archive_id = ""; - std::string counter_path = format("{0}/counters/standard") % plugin::get_config_path(); + std::string counter_path = "/var/lib/vdr/burn/counters/standard"; std::ifstream f(counter_path.c_str()); if (!f) { proctools::logger::error(proctools::format("couldn't read {0}") % counter_path); Index: vdrburn-archive.sh =================================================================== RCS file: /var/cvsroot/burn/vdrburn-archive.sh,v retrieving revision 1.5 diff -u -r1.5 vdrburn-archive.sh --- vdrburn-archive.sh 24 Oct 2006 17:46:27 -0000 1.5 +++ vdrburn-archive.sh 12 Dec 2006 20:31:14 -0000 @@ -43,12 +43,12 @@ ;; recordingmark) - cp "$CONFIG_PATH/counters/standard" "$RECORDING_PATH/dvd.vdr" + cp "/var/lib/vdr/burn/counters/standard" "$RECORDING_PATH/dvd.vdr" ;; archivemark) - ((DVD_ID = `cat $CONFIG_PATH/counters/standard | sed "s/^0*//"` + 1)) - printf "%04d\n" $DVD_ID > "$CONFIG_PATH/counters/standard" + ((DVD_ID = `cat /var/lib/vdr/burn/counters/standard | sed "s/^0*//"` + 1)) + printf "%04d\n" $DVD_ID > "/var/lib/vdr/burn/counters/standard" ;; *) Index: vdrburn-dvd.sh =================================================================== RCS file: /var/cvsroot/burn/vdrburn-dvd.sh,v retrieving revision 1.23 diff -u -r1.23 vdrburn-dvd.sh --- vdrburn-dvd.sh 24 Oct 2006 17:46:27 -0000 1.23 +++ vdrburn-dvd.sh 12 Dec 2006 20:31:14 -0000 @@ -29,11 +29,11 @@ # as $MPEG_TMP_PATH) if [ -z $JAVA_HOME ]; then - export JAVA_HOME=/opt/j2re1.4.2 + export JAVA_HOME=/usr/lib/jvm/jre fi if [ -z $PROJECTX_HOME ]; then - export PROJECTX_HOME=/opt/ProjectX + export PROJECTX_HOME=/usr/share/java fi # Some versions of growisofs refuse to start when run with sudo, and may @@ -61,7 +61,7 @@ CUT="-cut" fi - vdrsync.pl -o "$MPEG_TMP_PATH" \ + vdrsync -o "$MPEG_TMP_PATH" \ -v-filter "burn-buffers" \ -a-filter "burn-buffers" \ -ac3-filter "burn-buffers" \ @@ -197,15 +197,15 @@ echo "Deleting $TEMP_PATH/INDEX_${TRACK_ON_DVD}" rm -rf "$TEMP_PATH/INDEX_${TRACK_ON_DVD}" echo "Creating $RECORDING_PATH/dvd.vdr" - cp "$CONFIG_PATH/counters/standard" "$RECORDING_PATH/dvd.vdr" + cp "/var/lib/vdr/burn/counters/standard" "$RECORDING_PATH/dvd.vdr" printf "%04d\n" $(echo ${TRACK_ON_DVD} | sed 's/^0*//') >> "$RECORDING_PATH/dvd.vdr" ;; archivemark) echo "Creating $DVDAUTHOR_PATH/dvd.vdr" - cp "$CONFIG_PATH/counters/standard" "$DVDAUTHOR_PATH/dvd.vdr" - ((DVD_ID = `cat $CONFIG_PATH/counters/standard | sed "s/^0*//"` + 1)) - printf "%04d\n" $DVD_ID > "$CONFIG_PATH/counters/standard" + cp "/var/lib/vdr/burn/counters/standard" "$DVDAUTHOR_PATH/dvd.vdr" + ((DVD_ID = `cat /var/lib/vdr/burn/counters/standard | sed "s/^0*//"` + 1)) + printf "%04d\n" $DVD_ID > "/var/lib/vdr/burn/counters/standard" ;; mkiso) vdr-burn-0.1.0-pre21-finnish.patch: --- NEW FILE vdr-burn-0.1.0-pre21-finnish.patch --- Index: i18n.c =================================================================== RCS file: /var/cvsroot/burn/i18n.c,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- i18n.c 16 Sep 2006 18:33:36 -0000 1.38 +++ i18n.c 16 Sep 2006 22:08:38 -0000 1.39 @@ -2,7 +2,7 @@ * See the files COPYING and README for copyright information and how to reach * the author. * - * $Id: i18n.c,v 1.38 2006/09/16 18:33:36 lordjaxom Exp $ + * $Id: i18n.c,v 1.39 2006/09/16 22:08:38 lordjaxom Exp $ */ #include "i18n.h" @@ -322,7 +322,7 @@ "", "", "", - "", + "(joudutaan pienentämään)", "", "", "", @@ -3260,7 +3260,7 @@ "", "", "", - "Ohita tyhjä päävalikko", + "Ohita tyhjä nimikevalikko", "", "", "", @@ -3286,7 +3286,7 @@ "", "", "", - "Tarjoa päävalikon ohitusta", + "Tarjoa nimikevalikon ohitusta", "", "", "", @@ -3312,7 +3312,7 @@ "", "", "", - "", + "Tehtävän asetukset", "", "", "", @@ -3338,7 +3338,7 @@ "", "", "", - "", + "Ohita lyhyt päävalikko", "", "", "", @@ -3364,7 +3364,7 @@ "", "", "", - "", + "Tarjoa päävalikon ohitusta", "", "", "", vdr-burn-0.1.0-pre21-gcc43.patch: --- NEW FILE vdr-burn-0.1.0-pre21-gcc43.patch --- Index: adaptor.h =================================================================== RCS file: /var/cvsroot/burn/adaptor.h,v retrieving revision 1.4 diff -u -r1.4 adaptor.h --- adaptor.h 16 Sep 2006 18:33:36 -0000 1.4 +++ adaptor.h 8 Apr 2008 18:40:42 -0000 @@ -8,6 +8,7 @@ #ifndef VDR_BURN_ADAPTOR_H #define VDR_BURN_ADAPTOR_H +#include <algorithm> #include <iterator> #include <vdr/epg.h> #include <vdr/tools.h> Index: filter.h =================================================================== RCS file: /var/cvsroot/burn/filter.h,v retrieving revision 1.5 diff -u -r1.5 filter.h --- filter.h 16 Sep 2006 18:33:36 -0000 1.5 +++ filter.h 8 Apr 2008 18:40:42 -0000 @@ -9,6 +9,7 @@ #define VDR_BURN_FILTER_H #include "common.h" +#include <algorithm> #include <iterator> namespace vdr_burn Index: iconvwrapper.c =================================================================== RCS file: /var/cvsroot/burn/iconvwrapper.c,v retrieving revision 1.3 diff -u -r1.3 iconvwrapper.c --- iconvwrapper.c 16 Sep 2006 18:33:36 -0000 1.3 +++ iconvwrapper.c 8 Apr 2008 18:40:42 -0000 @@ -7,6 +7,8 @@ #include "iconvwrapper.h" #include <cerrno> +#include <cstdlib> +#include <cstring> #include <sstream> namespace iconvwrapper Index: menuitems.h =================================================================== RCS file: /var/cvsroot/burn/menuitems.h,v retrieving revision 1.15 diff -u -r1.15 menuitems.h --- menuitems.h 19 Sep 2006 18:51:35 -0000 1.15 +++ menuitems.h 8 Apr 2008 18:40:42 -0000 @@ -14,6 +14,7 @@ #include "tracks.h" #include <algorithm> #include <iterator> +#include <limits> #include <numeric> #include <memory> #include <string> Index: proctools/logger.cc =================================================================== RCS file: /var/cvsroot/burn/proctools/logger.cc,v retrieving revision 1.3 diff -u -r1.3 logger.cc --- proctools/logger.cc 16 Sep 2006 18:33:38 -0000 1.3 +++ proctools/logger.cc 8 Apr 2008 18:40:42 -0000 @@ -6,6 +6,7 @@ #include <sstream> #include <algorithm> #include <cerrno> +#include <cstring> namespace proctools { vdr-burn-0.1.0-pre21-no-subtitles.patch: --- NEW FILE vdr-burn-0.1.0-pre21-no-subtitles.patch --- diff -up burn-0.1.0-pre21/burn/ProjectX.ini~ burn-0.1.0-pre21/burn/ProjectX.ini --- burn-0.1.0-pre21/burn/ProjectX.ini~ 2006-08-18 23:27:52.000000000 +0300 +++ burn-0.1.0-pre21/burn/ProjectX.ini 2008-04-22 20:10:59.000000000 +0300 @@ -1,3 +1,6 @@ +# ExportPanel +ExportPanel.Streamtype.Subpicture=0 + # ExternPanel ExternPanel.renameAudio=1 ExternPanel.renameVideo=1 vdr-burn-0.1.0-pre21-utf8.patch: --- NEW FILE vdr-burn-0.1.0-pre21-utf8.patch --- diff -up burn-0.1.0-pre21/burn.c~ burn-0.1.0-pre21/burn.c --- burn-0.1.0-pre21/burn.c~ 2006-09-16 21:33:36.000000000 +0300 +++ burn-0.1.0-pre21/burn.c 2008-04-22 21:38:55.000000000 +0300 @@ -45,8 +45,8 @@ namespace vdr_burn string plugin::get_character_encoding() { -#ifdef UTF8PATCH - return "utf8"; +#if VDRVERSNUM >= 10510 || defined(UTF8PATCH) + return "utf-8"; #else return tr("iso8859-15"); #endif --- NEW FILE vdr-burn.conf --- # Configuration snippet for vdr-burn -*- sh -*- # # Add command line options to pass to the burn plugin to PLUGIN_OPTIONS. # See /usr/share/doc/vdr-burn-*/README and "vdr --help" for info about # available options for this plugin. PLUGIN_OPTIONS="-d /tmp" --- NEW FILE vdr-burn.spec --- # TODO: disksize 4420? 4462 was too big sometimes with 0.0.x %define pname burn %define plugindir %(vdr-config --plugindir 2>/dev/null || echo ERROR) %define configdir %(vdr-config --configdir 2>/dev/null || echo ERROR) %define videodir %(vdr-config --videodir 2>/dev/null || echo ERROR) %define vardir %(vdr-config --vardir 2>/dev/null || echo ERROR) %define vdruser %(vdr-config --user 2>/dev/null || echo ERROR) %define apiver %(vdr-config --apiversion 2>/dev/null || echo ERROR) %define pre pre21 %define gver 0.1.3 Name: vdr-%{pname} Version: 0.1.0 Release: 0.14.%{pre}%{?dist} Summary: DVD writing plugin for VDR Group: Applications/Multimedia # genindex is GPLv2+, rest GPL+ License: GPL+ and GPLv2+ URL: http://www.xeatre.tv/community/burn/ Source0: http://linux.kompiliert.net/contrib/%{name}-%{version}-%{pre}.tgz Source1: %{name}.conf Source2: http://www.muempf.de/down/genindex-%{gver}.tar.gz Patch0: %{name}-0.1.0-pre21-config.patch Patch1: http://www.saunalahti.fi/~rahrenbe/vdr/patches/vdr-burn-cvs-subpicture-id... Patch2: %{name}-0.1.0-pre21-finnish.patch Patch3: %{name}-0.1.0-pre21-gcc43.patch Patch4: %{name}-0.1.0-pre21-no-subtitles.patch Patch5: %{name}-0.1.0-pre21-utf8.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: vdr-devel >= 1.3.47 BuildRequires: boost-devel BuildRequires: gd-devel >= 2.0.33-9.3 Requires: vdr(abi) = %{apiver} Requires: vdrsync Requires: m2vrequantiser Requires: dvdauthor Requires: mjpegtools Requires: dvd+rw-tools Requires: dejavu-lgc-fonts >= 2.21 %description This plugin enables VDR to write compliant DVDs from VDR recordings while being able to control the process and to watch progress from inside VDRs on-screen-display. If the selected recordings don't fit the DVD, the video tracks are requantized (shrinked) automatically. The created menus support multipage descriptions (in case the recording summary exceeds one page). %prep %setup -q -c -a 2 cd burn find -name CVS | xargs rm -rf chmod -c -x *.[ch] genindex/*.[ch] proctools/*.cc proctools/*.h README %patch0 %patch1 %patch2 %patch3 -p0 if pkg-config --atleast-version 1.5.10 vdr ; then # Disable subtitles by default for now with 1.6.x, demux problems %patch4 -p1 fi %patch5 -p1 sed -i -e 's|/var/lib/vdr/|%{vardir}/|g' chain-archive.c jobs.c vdrburn-*.sh sed -i -e 's|"Vera"|"DejaVuLGCSans"|g' skins.c cd ../genindex-%{gver} sed -i -e 's/-g -O2/$(RPM_OPT_FLAGS)/' Makefile f=README ; iconv -f iso-8859-1 -t utf-8 -o ../README.genindex $f cd .. %build make -C burn %{?_smp_mflags} LIBDIR=. VDRDIR=%{_libdir}/vdr all make -C genindex-%{gver} %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT install -dm 755 $RPM_BUILD_ROOT%{plugindir}/bin install -pm 755 burn/libvdr-%{pname}.so.%{apiver} $RPM_BUILD_ROOT%{plugindir} install -pm 755 burn/*.sh burn/burn-buffers genindex-%{gver}/genindex \ $RPM_BUILD_ROOT%{plugindir}/bin install -dm 755 $RPM_BUILD_ROOT%{configdir}/plugins/burn/skins cp -pR burn/burn/* $RPM_BUILD_ROOT%{configdir}/plugins/burn rm -rf $RPM_BUILD_ROOT%{configdir}/plugins/burn/{counters,fonts/*} ln -s %{_datadir}/fonts/dejavu/DejaVuLGCSans.ttf \ $RPM_BUILD_ROOT%{configdir}/plugins/burn/fonts/ install -Dpm 644 burn/burn/counters/standard \ $RPM_BUILD_ROOT%{vardir}/burn/counters/standard install -Dpm 644 %{SOURCE1} \ $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf %clean rm -rf $RPM_BUILD_ROOT %post if [ $1 -gt 1 ] ; then # maybe upgrading from < 0.1.0? %{__perl} -pi -e 's/^.*(burnmark|handlearchived)\.sh.*\n$//' \ %{configdir}/reccmds.conf >/dev/null 2>&1 || : fi %files %defattr(-,root,root,-) %doc burn/COPYING burn/HISTORY burn/README README.genindex %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf %config(noreplace) %{configdir}/plugins/%{pname}/ %{plugindir}/bin/burn-buffers %{plugindir}/bin/genindex %{plugindir}/bin/vdrburn-archive.sh %{plugindir}/bin/vdrburn-dvd.sh %{plugindir}/libvdr-%{pname}.so.%{apiver} %defattr(-,%{vdruser},root) %config(noreplace) %{vardir}/burn/ %changelog * Mon Aug 04 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.1.0-0.14.pre21 - rebuild * Tue Apr 22 2008 Ville SkyttÃ€ <ville.skytta at iki.fi> - 0.1.0-0.13.pre21 - Use UTF-8 with VDR 1.6.x. - Disable subtitles with VDR 1.6.x and ProjectX by default (demux problems). * Tue Apr 8 2008 Ville SkyttÃ€ <ville.skytta at iki.fi> - 0.1.0-0.12.pre21 - Patch to fix build with GCC 4.3's cleaned up C++ headers. * Tue Apr 8 2008 Ville SkyttÃ€ <ville.skytta at iki.fi> - 0.1.0-0.11.pre21 - Rebuild for VDR 1.6.0. * Sat Dec 1 2007 Ville SkyttÃ€ <ville.skytta at iki.fi> - 0.1.0-0.10.pre21 - Use /dev/dvdrw as the default writer device, udev >= 115 no longer creates /dev/dvdwriter. * Sun Nov 18 2007 Ville SkyttÃ€ <ville.skytta at iki.fi> - 0.1.0-0.9.pre21 - Adjust font paths for dejavu-lgc-fonts 2.21+. - Drop old gd-devel missing dependency workaround. * Wed Aug 22 2007 Ville SkyttÃ€ <ville.skytta at iki.fi> - 0.1.0-0.8.pre21 - Use DejaVu LGC fonts instead of Bitstream Vera. - Improve comments in burn.conf. - License: GPL+ and GPLv2+ * Sun Jan 7 2007 Ville SkyttÃ€ <ville.skytta at iki.fi> - 0.1.0-0.7.pre21 - Rebuild for VDR 1.4.5. * Tue Dec 12 2006 Ville SkyttÃ€ <ville.skytta at iki.fi> - 0.1.0-0.6.pre21 - 0.1.0-pre21, include private copy of genindex (0.1.3) for now. * Sat Nov 4 2006 Ville SkyttÃ€ <ville.skytta at iki.fi> - 0.0.009-16 - Rebuild for VDR 1.4.4. * Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.0.009-15 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 * Sat Sep 23 2006 Ville SkyttÃ€ <ville.skytta at iki.fi> - 0.0.009-14 - Rebuild for VDR 1.4.3. * Sun Aug 6 2006 Ville SkyttÃ€ <ville.skytta at iki.fi> - 0.0.009-13 - Rebuild for VDR 1.4.1-3. * Sun Jun 11 2006 Ville SkyttÃ€ <ville.skytta at iki.fi> - 0.0.009-12 - Rebuild for VDR 1.4.1. * Sun Apr 30 2006 Ville SkyttÃ€ <ville.skytta at iki.fi> - 0.0.009-11 - Rebuild for VDR 1.4.0. * Mon Apr 17 2006 Ville SkyttÃ€ <ville.skytta at iki.fi> - 0.0.009-10 - Rebuild/adjust for VDR 1.3.47, require versioned vdr(abi). - Trim pre-RLO %%changelog entries. * Sun Mar 26 2006 Ville SkyttÃ€ <ville.skytta at iki.fi> - 0.0.009-9 - Rebuild for VDR 1.3.45. * Sat Mar 18 2006 Thorsten Leemhuis <fedora at leemhuis.info> - 0.0.009-8 - drop 0.lvn * Wed Mar 1 2006 Ville SkyttÃ€ <ville.skytta at iki.fi> - 0.0.009-0.lvn.8 - Decrease default DVD size to 4420 to accommodate more requant inaccuracy. - Rebuild for VDR 1.3.44. * Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - add dist * Sun Feb 19 2006 Ville SkyttÃ€ <ville.skytta at iki.fi> - 0.0.009-0.lvn.7 - Rebuild for VDR 1.3.43. * Sun Feb 5 2006 Ville SkyttÃ€ <ville.skytta at iki.fi> - 0.0.009-0.lvn.6 - Rebuild for VDR 1.3.42. * Sun Jan 22 2006 Ville SkyttÃ€ <ville.skytta at iki.fi> - 0.0.009-0.lvn.5 - Rebuild for VDR 1.3.40. * Sun Jan 15 2006 Ville SkyttÃ€ <ville.skytta at iki.fi> - 0.0.009-0.lvn.4 - Rebuild for VDR 1.3.39. * Sun Jan 8 2006 Ville SkyttÃ€ <ville.skytta at iki.fi> - 0.0.009-0.lvn.3 - Rebuild for VDR 1.3.38. * Sat Dec 31 2005 Ville SkyttÃ€ <ville.skytta at iki.fi> - 0.0.009-0.lvn.2 - Q'n'd fix for ISO creation with recordings whose title contain "/". - Fix storing of the "clean up after # jobs" configuration option. - Don't chmod everything in results to 0777 in author only mode. - Use tcmplex-panteltje by default again. - Translation improvements. - Fix up some paths in README. - Ship TODO. * Sun Nov 13 2005 Ville SkyttÃ€ <ville.skytta at iki.fi> - 0.0.009-0.lvn.1 - 0.0.009 + Finnish translations from Rolf Ahrenberg, config patch applied upstream. * Sat Nov 12 2005 Ville SkyttÃ€ <ville.skytta at iki.fi> - 0.0.007-0.lvn.1 - 0.0.007, endstatus and burndefault patches applied/obsoleted upstream. * Sun Nov 6 2005 Ville SkyttÃ€ <ville.skytta at iki.fi> - 0.0.6k-0.lvn.2 - Rebuild for VDR 1.3.36. * Tue Nov 1 2005 Ville SkyttÃ€ <ville.skytta at iki.fi> - 0.0.6k-0.lvn.1 - 0.0.6k, commands and VDR >= 1.3.25 patches applied upstream. - Improve default burn settings. - Fix burn status at end when not verifying. * Mon Oct 3 2005 Ville SkyttÃ€ <ville.skytta at iki.fi> - 0.0.6g-1.lvn.8.pre3 - Rebuild for VDR 1.3.34. * Sun Sep 25 2005 Ville SkyttÃ€ <ville.skytta at iki.fi> - 0.0.6g-1.lvn.7.pre3 - Rebuild for VDR 1.3.33. * Sun Sep 11 2005 Ville SkyttÃ€ <ville.skytta at iki.fi> - 0.0.6g-1.lvn.6.pre3 - Rebuild for VDR 1.3.32. * Tue Aug 30 2005 Ville SkyttÃ€ <ville.skytta at iki.fi> - 0.0.6g-1.lvn.5.pre3 - Rebuild for VDR 1.3.31. * Sun Aug 21 2005 Ville SkyttÃ€ <ville.skytta at iki.fi> - 0.0.6g-1.lvn.4.pre3 - Rebuild for VDR 1.3.30. * Fri Aug 19 2005 Dams <anvil[AT]livna.org> - 0.0.6g-1.lvn.3.pre3 - Redirected vdr-config invocation standard error to /dev/null * Tue Aug 16 2005 Ville SkyttÃ€ <ville.skytta at iki.fi> - 0.0.6g-1.lvn.2.pre3 - Try to avoid build system problems by not using %%expand with vdr-config. * Fri Aug 12 2005 Ville SkyttÃ€ <ville.skytta at iki.fi> - 0.0.6g-1.lvn.1.pre3 - Update URLs. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/vdr-burn/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 16:56:12 -0000 1.1 +++ .cvsignore 4 Aug 2008 18:44:31 -0000 1.2 @@ -0,0 +1,3 @@ +genindex-0.1.3.tar.gz +vdr-burn-0.1.0-pre21.tgz +vdr-burn-cvs-subpicture-id.diff.gz Index: sources =================================================================== RCS file: /cvs/free/rpms/vdr-burn/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:56:12 -0000 1.1 +++ sources 4 Aug 2008 18:44:31 -0000 1.2 @@ -0,0 +1,3 @@ +da67b1ae819bf9c064af49ab64dbf27b genindex-0.1.3.tar.gz +11217a15e753b7affaf663a0446e22bb vdr-burn-0.1.0-pre21.tgz +18a484732c6eade746852642d882ed66 vdr-burn-cvs-subpicture-id.diff.gz

16 years, 3 months

1
0
0 / 0

rpms/smpeg/devel smpeg-0.4.4-aclocal18.patch, NONE, 1.1 smpeg-0.4.4-cvs-byteorder.patch, NONE, 1.1 smpeg-0.4.4-cvs-createyuvoverlay.patch, NONE, 1.1 smpeg-0.4.4-fixes.patch, NONE, 1.1 smpeg-0.4.4-gcc32.patch, NONE, 1.1 smpeg-0.4.4-gcc41.patch, NONE, 1.1 smpeg-0.4.4-optflags.patch, NONE, 1.1 smpeg-0.4.4-version.patch, NONE, 1.1 smpeg.spec, NONE, 1.1

by Thorsten Leemhuis

Author: thl Update of /cvs/free/rpms/smpeg/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv20513 Added Files: smpeg-0.4.4-aclocal18.patch smpeg-0.4.4-cvs-byteorder.patch smpeg-0.4.4-cvs-createyuvoverlay.patch smpeg-0.4.4-fixes.patch smpeg-0.4.4-gcc32.patch smpeg-0.4.4-gcc41.patch smpeg-0.4.4-optflags.patch smpeg-0.4.4-version.patch smpeg.spec Log Message: initial import from livna smpeg-0.4.4-aclocal18.patch: --- NEW FILE smpeg-0.4.4-aclocal18.patch --- --- smpeg.m4~ 2001-04-04 23:28:14.000000000 +0300 +++ smpeg.m4 2004-12-04 19:59:28.622341976 +0200 @@ -10,7 +10,7 @@ ACTION-IF-NOT-FOUND]]]) dnl Test for SMPEG, and define SMPEG_CFLAGS and SMPEG_LIBS dnl -AC_DEFUN(AM_PATH_SMPEG, +AC_DEFUN([AM_PATH_SMPEG], [dnl dnl Get the cflags and libraries from the smpeg-config script dnl smpeg-0.4.4-cvs-byteorder.patch: --- NEW FILE smpeg-0.4.4-cvs-byteorder.patch --- Index: smpeg.cpp =================================================================== RCS file: /cvs/cvsroot/smpeg/smpeg.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- smpeg.cpp 4 Apr 2001 21:58:18 -0000 1.20 +++ smpeg.cpp 31 Dec 2003 04:48:47 -0000 1.21 @@ -32,6 +32,37 @@ MPEG *obj; }; + +static inline int sanityCheckByteorder(void) +{ + int sane = 0; + union { + Uint32 ui32; + Uint8 ui8[4]; + } swapper; + + swapper.ui32 = 0x00000001; + +#if SDL_BYTEORDER == SDL_LIL_ENDIAN + sane = (swapper.ui8[0] == 0x01); +#else + sane = (swapper.ui8[3] == 0x01); +#endif + + if (!sane) { + fprintf(stderr, + "\n\n" + "*************************************************************\n" + " SMPEG ERROR: SDL is wrong about this platform's byte order!\n" + " You need to fix your SDL install before SMPEG can work!\n" + "*************************************************************\n" + "\n\n"); + } + + return(sane); +} + + /* Create a new SMPEG object from an MPEG file. On return, if 'info' is not NULL, it will be filled with information about the MPEG object. @@ -45,6 +76,9 @@ { SMPEG *mpeg; + if (!sanityCheckByteorder()) + return(NULL); + /* Create a new SMPEG object! */ mpeg = new SMPEG; mpeg->obj = new MPEG(file, sdl_audio ? true : false); @@ -61,6 +95,9 @@ { SMPEG *mpeg; + if (!sanityCheckByteorder()) + return(NULL); + /* Create a new SMPEG object! */ mpeg = new SMPEG; mpeg->obj = new MPEG(file, sdl_audio ? true : false); @@ -81,6 +118,9 @@ { SMPEG *mpeg; + if (!sanityCheckByteorder()) + return(NULL); + /* Create a new SMPEG object! */ mpeg = new SMPEG; mpeg->obj = new MPEG(data, size, sdl_audio ? true : false); @@ -96,6 +136,9 @@ { SMPEG *mpeg; + if (!sanityCheckByteorder()) + return(NULL); + /* Create a new SMPEG object! */ mpeg = new SMPEG; mpeg->obj = new MPEG(src, sdl_audio ? true : false); smpeg-0.4.4-cvs-createyuvoverlay.patch: --- NEW FILE smpeg-0.4.4-cvs-createyuvoverlay.patch --- Index: video/MPEGvideo.cpp =================================================================== RCS file: /cvs/cvsroot/smpeg/video/MPEGvideo.cpp,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- video/MPEGvideo.cpp 18 Jun 2001 20:59:57 -0000 1.40 +++ video/MPEGvideo.cpp 31 Dec 2003 05:09:34 -0000 1.41 @@ -438,6 +438,10 @@ SDL_FreeYUVOverlay(_image); } _image = SDL_CreateYUVOverlay(_srcrect.w, _srcrect.h, SDL_YV12_OVERLAY, dst); + if ( _image == NULL ) { + return false; + } + if ( !_dstrect.w || !_dstrect.h ) { _dstrect.w = dst->w; _dstrect.h = dst->h; @@ -502,6 +506,7 @@ { SDL_FreeYUVOverlay(_image); _image = SDL_CreateYUVOverlay(_srcrect.w, _srcrect.h, SDL_YV12_OVERLAY, _dst); + /* !!! FIXME: Uhh...what if this one fails? */ } SDL_mutexV( _mutex ); smpeg-0.4.4-fixes.patch: --- NEW FILE smpeg-0.4.4-fixes.patch --- Index: MPEG.cpp =================================================================== RCS file: /cvs/cvsroot/smpeg/MPEG.cpp,v retrieving revision 1.29 retrieving revision 1.31 diff -u -u -r1.29 -r1.31 --- MPEG.cpp 2001/06/18 20:59:57 1.29 +++ MPEG.cpp 2003/01/26 00:21:41 1.31 @@ -98,7 +98,8 @@ videoaction = NULL; audio = NULL; video = NULL; - audioaction_enabled = videoaction_enabled = false; + audioaction_enabled = SDLaudio; + videoaction_enabled = false; loop = false; pause = false; @@ -133,6 +134,7 @@ video = NULL; system = NULL; error = NULL; + source = NULL; audiostream = videostream = NULL; audioaction = NULL; Index: MPEGaudio.h =================================================================== RCS file: /cvs/cvsroot/smpeg/MPEGaudio.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -u -r1.22 -r1.23 --- MPEGaudio.h 2001/04/04 20:42:40 1.22 +++ MPEGaudio.h 2001/07/17 19:52:24 1.23 @@ -212,6 +212,7 @@ /* MPEG header variables */ /*************************/ private: + int last_speed; int layer,protection,bitrateindex,padding,extendedmode; enum _mpegversion {mpeg1,mpeg2} version; enum _mode {fullstereo,joint,dual,single} mode; Index: MPEGlist.cpp =================================================================== RCS file: /cvs/cvsroot/smpeg/MPEGlist.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -u -r1.5 -r1.6 --- MPEGlist.cpp 2000/06/06 01:51:43 1.5 +++ MPEGlist.cpp 2003/01/26 00:21:41 1.6 @@ -16,7 +16,7 @@ if(prev) prev->next = next; if(data) { - delete data; + delete[] data; data = 0; } } Index: MPEGsystem.cpp =================================================================== RCS file: /cvs/cvsroot/smpeg/MPEGsystem.cpp,v retrieving revision 1.37 retrieving revision 1.38 diff -u -u -r1.37 -r1.38 --- MPEGsystem.cpp 2001/04/27 23:12:17 1.37 +++ MPEGsystem.cpp 2003/01/26 00:21:41 1.38 @@ -1165,8 +1165,8 @@ time = -1; } - delete buffer; + delete[] buffer; /* Get back to saved position */ if((pos = SDL_RWseek(source, pos, SEEK_SET)) < 0) Index: glmovie.c =================================================================== RCS file: /cvs/cvsroot/smpeg/glmovie.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -u -r1.5 -r1.6 --- glmovie.c 2000/10/04 17:38:03 1.5 +++ glmovie.c 2002/07/10 02:38:48 1.6 @@ -8,8 +8,8 @@ #include <stdlib.h> #include <malloc.h> #include <string.h> -#include <unistd.h> +/*#include <unistd.h>*/ #include "glmovie.h" static void glmpeg_update( SDL_Surface*, Sint32, Sint32, Uint32, Uint32 ); Index: audio/MPEGaudio.cpp =================================================================== RCS file: /cvs/cvsroot/smpeg/audio/MPEGaudio.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -u -u -r1.28 -r1.29 --- audio/MPEGaudio.cpp 2001/04/04 20:42:40 1.28 +++ audio/MPEGaudio.cpp 2002/06/08 09:53:51 1.29 @@ -200,9 +200,13 @@ MPEGaudio:: Stop(void) { if ( valid_stream ) { - SDL_LockAudio(); + if ( sdl_audio ) + SDL_LockAudio(); + playing = false; - SDL_UnlockAudio(); + + if ( sdl_audio ) + SDL_UnlockAudio(); } ResetPause(); } Index: audio/mpegtoraw.cpp =================================================================== RCS file: /cvs/cvsroot/smpeg/audio/mpegtoraw.cpp,v retrieving revision 1.33 retrieving revision 1.35 diff -u -u -r1.33 -r1.35 --- audio/mpegtoraw.cpp 2001/04/05 20:27:48 1.33 +++ audio/mpegtoraw.cpp 2003/02/15 02:01:15 1.35 @@ -84,6 +84,7 @@ register REAL *s1,*s2; REAL *s3,*s4; + last_speed = 0; stereo = true; forcetomonoflag = false; forcetostereoflag = false; @@ -271,6 +272,20 @@ getbyte(); // CRC, Not check!! getbyte(); } + + // Sam 7/17 - skip sequences of quickly varying frequencies + int speed = frequencies[version][frequency]; + if ( speed != last_speed ) { + last_speed = speed; + if ( rawdatawriteoffset ) { + ++decodedframe; +#ifndef THREADED_AUDIO + ++currentframe; +#endif + } + return loadheader(); + } + return true; } @@ -350,7 +365,6 @@ } audio->decoding = false; - audio->decode_thread = NULL; return(0); } #endif /* THREADED_AUDIO */ smpeg-0.4.4-gcc32.patch: --- NEW FILE smpeg-0.4.4-gcc32.patch --- Index: Makefile.am =================================================================== RCS file: /cvs/cvsroot/smpeg/Makefile.am,v retrieving revision 1.15 retrieving revision 1.16 diff -u -u -r1.15 -r1.16 --- Makefile.am 2001/04/04 20:28:14 1.15 +++ Makefile.am 2002/09/26 05:24:04 1.16 @@ -4,6 +4,8 @@ # These are the subdirectories that are always built SUBDIRS = audio video +CXXLD = cc + bin_SCRIPTS = smpeg-config # The smpeg library target @@ -34,7 +36,7 @@ libsmpeg_la_LDFLAGS = \ -release $(LT_RELEASE) \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -lstdc++ libsmpeg_la_LIBADD = \ audio/libaudio.la \ smpeg-0.4.4-gcc41.patch: --- NEW FILE smpeg-0.4.4-gcc41.patch --- =================================================================== RCS file: /cvs/cvsroot/smpeg/MPEGaudio.h,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- smpeg/MPEGaudio.h 2005/12/17 03:09:08 1.24 +++ smpeg/MPEGaudio.h 2005/12/17 03:17:06 1.25 @@ -155,12 +155,6 @@ /* The actual MPEG audio class */ class MPEGaudio : public MPEGerror, public MPEGaudioaction { - friend void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len); - friend int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len); -#ifdef THREADED_AUDIO - friend int Decode_MPEGaudio(void *udata); -#endif - public: MPEGaudio(MPEGstream *stream, bool initSDL = true); virtual ~MPEGaudio(); @@ -371,6 +365,20 @@ #define N_TIMESTAMPS 5 double timestamp[N_TIMESTAMPS]; + + /* Functions which access MPEGaudio internals */ + friend void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len); + friend int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len); +#ifdef THREADED_AUDIO + friend int Decode_MPEGaudio(void *udata); +#endif }; +/* Need to duplicate the prototypes, this is not a typo :) */ +void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len); +int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len); +#ifdef THREADED_AUDIO +int Decode_MPEGaudio(void *udata); +#endif + #endif /* _MPEGAUDIO_H_ */ smpeg-0.4.4-optflags.patch: --- NEW FILE smpeg-0.4.4-optflags.patch --- --- configure.in~ 2001-04-24 22:25:39.000000000 +0300 +++ configure.in 2004-12-04 20:04:32.859154887 +0200 @@ -104,18 +104,6 @@ if test x$ac_cv_prog_gcc = xyes; then CFLAGS="$CFLAGS -fexpensive-optimizations -fomit-frame-pointer" fi - case "$target" in - i486-*-*) # Yeah right. :) - if test x$ac_cv_prog_gcc = xyes; then - CFLAGS="$CFLAGS -march=486" - fi - ;; - i?86-*-*) - if test x$ac_cv_prog_gcc = xyes; then - CFLAGS="$CFLAGS -march=pentium -mcpu=pentiumpro" - fi - ;; - esac fi dnl Check for SDL smpeg-0.4.4-version.patch: --- NEW FILE smpeg-0.4.4-version.patch --- --- smpeg-0.4.4/smpeg.h 2001-04-04 23:58:18.000000000 +0200 +++ smpeg/smpeg.h 2001-07-17 21:52:24.000000000 +0200 @@ -34,7 +34,7 @@ #define SMPEG_MAJOR_VERSION 0 #define SMPEG_MINOR_VERSION 4 -#define SMPEG_PATCHLEVEL 3 +#define SMPEG_PATCHLEVEL 4 typedef struct { Uint8 major; --- NEW FILE smpeg.spec --- Name: smpeg Version: 0.4.4 Release: 12%{?dist} Summary: MPEG library for SDL Group: System Environment/Libraries License: LGPL URL: http://icculus.org/smpeg/ Source0: ftp://sunsite.dk/pub/os/linux/loki/open-source/smpeg/smpeg-0.4.4.tar.gz Patch0: smpeg-0.4.4-gcc32.patch Patch1: smpeg-0.4.4-fixes.patch Patch2: smpeg-0.4.4-version.patch Patch3: smpeg-0.4.4-cvs-byteorder.patch Patch4: smpeg-0.4.4-cvs-createyuvoverlay.patch Patch5: smpeg-0.4.4-aclocal18.patch Patch6: smpeg-0.4.4-optflags.patch #http://cvs.icculus.org/cvs/smpeg/MPEGaudio.h?r1=1.24&r2=1.25&sortby=date&makepatch=1&diff_format=u Patch7: smpeg-0.4.4-gcc41.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel BuildRequires: gtk+-devel BuildRequires: automake14 BuildRequires: autoconf %description SMPEG is based on UC Berkeley's mpeg_play software MPEG decoder and SPLAY, an MPEG audio decoder created by Woo-jae Jung. SMPEG has completed the initial work to wed these two projects in order to create a general purpose MPEG video/audio player for the Linux OS. %package devel Summary: Header files and static libraries for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: SDL-devel %description devel This package contains header files and static libraries for %{name}. %prep %setup -q %patch0 -p0 %patch1 -p0 %patch2 -p1 %patch3 -p0 %patch4 -p0 %patch5 -p0 %patch6 -p0 %patch7 -p1 %{__perl} -pi -e 's|\s*\@SMPEG_RLD_FLAGS\@||' smpeg-config.in aclocal-1.4 automake-1.4 -a autoconf %build %configure --disable-debug --disable-opengl-player --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc CHANGES COPYING README TODO %{_bindir}/plaympeg %{_bindir}/gtv %{_libdir}/libsmpeg-0.4.so.* %{_mandir}/man[^3]/* %files devel %defattr(-,root,root,-) %{_bindir}/smpeg-config %{_includedir}/smpeg %{_libdir}/libsmpeg.so %{_datadir}/aclocal/smpeg.m4 %changelog * Mon Aug 04 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.4.4-12 - rebuild * Fri Oct 6 2006 Dams <anvil[AT]livna.org> - 0.4.4-11 - libsmpeg-0.4.so -> libsmpeg.so * Fri Oct 6 2006 Dams <anvil[AT]livna.org> - 0.4.4-10 - Small cleanup - Disabled static libraries * 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 * Fri Jan 20 2006 Adrian Reber <adrian(a)lisas.de> - 0.4.4-0.lvn.9 - Added patch from CVS to fix gcc 4.1 errors - Dropped 0 Epoch * Sat Dec 4 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.4-0.lvn.8 - Honor $RPM_OPT_FLAGS. - Avoid aclocal >= 1.8 warnings from smpeg.m4. * Sun May 23 2004 Marius L. Jøhndal <mariuslj at ifi.uio.no> - 0:0.4.4-0.lvn.7 - Added bug-fixes from CVS: smpeg-0.4.4-cvs-byteorder.patch, smpeg-0.4.4-cvs-createyuvoverlay.patch. * Thu May 20 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.4.4-0.lvn.6 - Avoid rpath in smpeg-config. * Thu Oct 16 2003 Marius L. Jøhndal <mariuslj at ifi.uio.no> - 0:0.4.4-0.fdr.5 - smpeg-devel requires SDL-devel. - Brought in line with Fedora's spec template. - Added version number patch. * Sun May 11 2003 Marius L. Jøhndal <mariuslj at ifi.uio.no> - 0:0.4.4-0.fdr.4 - Corrected description text. - Added TODO to documentation. - Use RPM_BUILD_ROOT instead of macro. * Sat May 3 2003 Marius L. Jøhndal <mariuslj at ifi.uio.no> - 0:0.4.4-0.fdr.3 - Added epoch to -devel requires. * Sat Apr 26 2003 Marius L. Jøhndal <mariuslj at ifi.uio.no> - 0:0.4.4-0.fdr.2 - Added epoch. - Bug-fixes from CVS. - Added full path of source. * Thu Mar 6 2003 Marius L. Jøhndal <mariuslj at ifi.uio.no> - 0.4.4-0.fdr.1 - Initial Fedora RPM release. * Tue Oct 29 2002 Marius L. Jøhndal <mariuslj at ifi.uio.no> - Changed configure invocation to macro. - Modified installation paths to use bindir, libdir etc. - Patch for strange g++ 3.2 build errors. * Fri Mar 3 2000 Sam Lantinga <hercules(a)lokigames.com> - Split package into development and runtime packages

16 years, 3 months

1
0
0 / 0

rpms/ufoai/devel ufoai-2.2-libdir.patch, NONE, 1.1 ufoai-ded.desktop, NONE, 1.1 ufoai.desktop, NONE, 1.1 ufoai.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

by Thorsten Leemhuis

Author: thl Update of /cvs/free/rpms/ufoai/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv20238 Modified Files: .cvsignore sources Added Files: ufoai-2.2-libdir.patch ufoai-ded.desktop ufoai.desktop ufoai.spec Log Message: first build ufoai-2.2-libdir.patch: --- NEW FILE ufoai-2.2-libdir.patch --- --- ufoai-2.2-source/src/common/files.c.orig 2007-12-10 08:29:39.000000000 +0000 +++ ufoai-2.2-source/src/common/files.c 2008-02-26 13:55:38.000000000 +0000 @@ -35,6 +35,7 @@ /* in memory */ static cvar_t *fs_basedir; +static cvar_t *fs_libdir; cvar_t *fs_gamedir; typedef struct filelink_s { @@ -894,6 +895,12 @@ /* start up with base by default */ FS_AddGameDirectory(va("%s/" BASEDIRNAME, fs_basedir->string)); + /* allows the game to search the library dirs */ + fs_libdir = Cvar_Get("fs_libdir", ".", CVAR_NOSET, "Allows the game to search the library dirs"); + + /* start up with empty path by default */ + FS_AddGameDirectory(va("%s", fs_libdir->string)); + /* then add a '.ufoai/base' directory in home directory by default */ if (fs_usehomedir->integer) FS_AddHomeAsGameDirectory(BASEDIRNAME); --- NEW FILE ufoai-ded.desktop --- [Desktop Entry] Name=UFO:AI Dedicated Server GenericName=Strategy Game (server) GenericName[cs]=Strategická hra (server) GenericName[da]=Strategispil (server) GenericName[de]=Strategiespiel (Server) GenericName[es]=Juego de estrategia (servidor) GenericName[et]=Strateegiamäng GenericName[fi]=Avaruuspeli (palvelin) GenericName[fr]=Jeu de stratégie (serveur) GenericName[it]=Gioco di strategia (server) GenericName[pl]=Gra strategiczna (serwer) GenericName[pt_BR]=Jogo de Estratégia (servidor) GenericName[ru]=Завоевание (сервер) GenericName[sl]=Strateška igra (strežnik) GenericName[sv]=Strategispel (värddator) Comment=UFO: Alien Invasion Dedicated Server Exec=ufoded-wrapper.sh Icon=ufoai-ded Terminal=false Type=Application Categories=Game;StrategyGame; --- NEW FILE ufoai.desktop --- [Desktop Entry] Name=UFO:AI GenericName=Strategy Game GenericName[cs]=Strategická hra GenericName[da]=Strategispil GenericName[de]=Strategiespiel GenericName[es]=Juego de estrategia GenericName[et]=Strateegiamäng GenericName[fi]=Avaruuspeli GenericName[fr]=Jeu de stratégie GenericName[it]=Gioco di strategia GenericName[pl]=Gra strategiczna GenericName[pt_BR]=Jogo de Estratégia GenericName[ru]=Завоевание GenericName[sl]=Strateška igra GenericName[sv]=Strategispel Comment=UFO: Alien Invasion Exec=ufoai-wrapper.sh Icon=ufoai Terminal=false Type=Application Categories=Game;StrategyGame; --- NEW FILE ufoai.spec --- Name: ufoai Version: 2.2.1 Release: 2%{?dist} Summary: UFO: Alien Invasion Group: Amusements/Games License: GPLv2+ URL: http://ufoai.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-source.tar.bz2 Source1: %{name}.desktop Source2: %{name}-ded.desktop Patch: ufoai-2.2-libdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils curl-devel freealut-devel gettext BuildRequires: libjpeg-devel libogg-devel libpng-devel libvorbis-devel BuildRequires: libXxf86dga-devel libXxf86vm-devel SDL-devel SDL_mixer-devel BuildRequires: SDL_ttf-devel Requires: opengl-games-utils Requires: %{name}-data = %{version} %package doc Summary: UFO: Alien Invasion user manual Group: Documentation License: GFDL BuildRequires: tetex-latex %description UFO: ALIEN INVASION is a strategy game featuring tactical combat against hostile alien forces which are about to infiltrate earth at this very moment. You are in command of a small special unit which has been founded to face the alien strike force. To be successful on the long run, you will also have to have a research team study the aliens and their technologies in order to learn as much as possible about their technology, their goals and the aliens themselves. %description doc UFO: ALIEN INVASION is a strategy game featuring tactical combat against hostile alien forces which are about to infiltrate earth at this very moment. This package contains the user manual for the game. %prep %setup -q -n %{name}-%{version}-source ## we do not like "arch-dependent-file" in /usr/share # change the target for the library sed -i -e "s/base/./" build/game.mk # allow to set the library path %patch -p1 %build %configure --disable-ufo2map --enable-release make %{?_smp_mflags} make %{?_smp_mflags} lang # wrapper scripts - generated because we need arch dependent paths cat > %{name}-wrapper.sh <<-EOF #!/bin/sh . /usr/share/opengl-games-utils/opengl-game-functions.sh checkDriOK UFO:AI exec ufo \\ +set fs_libdir %{_libdir}/%{name} \\ +set fs_basedir %{_datadir}/%{name} \\ +set fs_i18ndir %{_datadir}/locale \\ "\$@" EOF cat > ufoded-wrapper.sh <<-EOF #!/bin/sh exec ufoded \\ +set fs_libdir %{_libdir}/%{name} \\ +set fs_basedir %{_datadir}/%{name} \\ +set fs_i18ndir %{_datadir}/locale \\ "\$@" EOF # build documentation cd src/docs/tex make %{?_smp_mflags} %install rm -rf %{buildroot} install -D -m 0755 ufo %{buildroot}%{_bindir}/ufo install -D -m 0755 ufoded %{buildroot}%{_bindir} install -p -m 0755 %{name}-wrapper.sh %{buildroot}%{_bindir} install -p -m 0755 ufoded-wrapper.sh %{buildroot}%{_bindir} install -D -m 0755 game.so %{buildroot}%{_libdir}/%{name}/game.so mkdir -p -m 0755 %{buildroot}%{_datadir}/locale cp -pr base/i18n/* %{buildroot}%{_datadir}/locale/ mkdir -p -m 0755 %{buildroot}%{_datadir}/icons/hicolor/32x32/apps cp -p src/ports/linux/ufo.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png cp -p src/ports/linux/ufoded.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}-ded.png desktop-file-install --vendor="fedora" \ --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} desktop-file-install --vendor="fedora" \ --dir=%{buildroot}%{_datadir}/applications %{SOURCE2} %find_lang %{name} # install documentation mkdir -p -m 0755 %{buildroot}%{_docdir}/%{name}-%{version} cp -pr README CONTRIBUTORS COPYING src/docs/tex/*.pdf \ %{buildroot}%{_docdir}/%{name}-%{version}/ %clean rm -rf %{buildroot} %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 %files -f %{name}.lang %defattr(-,root,root,-) # we need to use full path so %doc does not the cleanup %doc %{_docdir}/%{name}-%{version}/README %doc %{_docdir}/%{name}-%{version}/CONTRIBUTORS %doc %{_docdir}/%{name}-%{version}/COPYING %{_bindir}/* %{_libdir}/%{name}/ %{_datadir}/applications/ %{_datadir}/icons/hicolor/32x32/apps/ %files doc %defattr(-,root,root,-) %doc %{_docdir}/%{name}-%{version}/*.pdf %lang(en) %{_docdir}/%{name}-%{version}/ufo-manual_EN.pdf %changelog * Mon Aug 04 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 2.2.1-2 - rebuild * Mon Jun 09 2008 Karel Volny <kvolny(a)redhat.com> 2.2.1-1 - Version bump - Fixes Livna bug #1931 - Configure with --enable-release * Tue Feb 26 2008 Karel Volny <kvolny(a)redhat.com> 2.2-5 - Added patch to allow setting fs_libdir, fixes Livna bug #1882 * Tue Feb 19 2008 Karel Volny <kvolny(a)redhat.com> 2.2-4 - Changed BuildRequires of the doc subpackage to tetex-latex instead of tetex * Mon Feb 18 2008 Karel Volny <kvolny(a)redhat.com> 2.2-3 - Fixed BuildRequires to include SDL_mixer-devel * Mon Feb 04 2008 Karel Volny <kvolny(a)redhat.com> 2.2-2 - Merged in ufoai-doc as a subpackage - Added gtk-update-icon-cache to %%post and %%postun * Tue Jan 22 2008 Karel Volny <kvolny(a)redhat.com> 2.2-1 - Version bump - Added BuildRequires: curl-devel - Changed language file handling - Use bundled icons - Added ufoded wrapper and menu entry * Mon Jan 07 2008 Karel Volny <kvolny(a)redhat.com> 2.1.1-3 - Marked localisation files - Some fixes according the comment #18 to bug #412001: - Added BuildRequires: freealut-devel libXxf86vm-devel libXxf86dga-devel - Improved .desktop file - Added fix for mixed encoding within the file CONTRIBUTORS * Thu Dec 06 2007 Karel Volny <kvolny(a)redhat.com> 2.1.1-2 - Split the game, data and additional music into separate packages - Added wrapper script to use correct command line parameters and OpenGL Wrapper - Added ufoai.desktop as a separate file * Tue Dec 04 2007 Karel Volny <kvolny(a)redhat.com> 2.1.1-1 - Initial release for Fedora 8 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/ufoai/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 16:55:32 -0000 1.1 +++ .cvsignore 4 Aug 2008 18:35:22 -0000 1.2 @@ -0,0 +1 @@ +ufoai-2.2.1-source.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/ufoai/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:55:32 -0000 1.1 +++ sources 4 Aug 2008 18:35:22 -0000 1.2 @@ -0,0 +1 @@ +d3d1e45056fe87efbd9a0f000779ab17 ufoai-2.2.1-source.tar.bz2

16 years, 3 months

1
0
0 / 0

rpms/xmms-mp3/F-9 xmms-mp3.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

by Thorsten Leemhuis

Author: thl Update of /cvs/free/rpms/xmms-mp3/F-9 In directory se02.es.rpmfusion.net:/tmp/cvs-serv19836 Modified Files: .cvsignore sources Added Files: xmms-mp3.spec Log Message: initial import from livna --- NEW FILE xmms-mp3.spec --- %define inputplugindir %(xmms-config --input-plugin-dir 2>/dev/null) %define xmmsepoch 1 Summary: MP3 output plugin for XMMS Name: xmms-mp3 Version: 1.2.10 Release: 6%{?dist} License: GPL Group: Applications/Multimedia URL: http://www.xmms.org/ Source: http://www.xmms.org/files/1.2.x/xmms-%{version}.tar.bz2 Requires: xmms-libs = %{xmmsepoch}:%{version} BuildRequires: gtk+-devel glib-devel BuildRequires: xmms-devel = %{xmmsepoch}:%{version} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot %ifarch x86_64 BuildRequires: libtool %endif # -------------------------------------------------------------------- %description XMMS is a multimedia (Ogg Vorbis, CDs) player for the X Window System with an interface similar to Winamp's. XMMS supports playlists and streaming content and has a configurable interface. This is the output plugin needed to play MP3 audio files. # -------------------------------------------------------------------- %prep %setup -q -n xmms-%{version} # -------------------------------------------------------------------- %build %configure \ %ifarch athlon i686 --enable-simd \ %endif --enable-kanji --enable-texthack --enable-arts-shared perl -pi -e 's#\$$top_builddir$/libxmms/libxmms.la##g' Input/mpg123/Makefile make -C Input/mpg123 \ %ifarch x86_64 LIBTOOL=/usr/bin/libtool \ %endif %{?_smp_mflags} # -------------------------------------------------------------------- %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{inputplugindir} install -p -m 0755 Input/mpg123/.libs/libmpg123.so $RPM_BUILD_ROOT%{inputplugindir} # -------------------------------------------------------------------- %clean rm -rf $RPM_BUILD_ROOT # -------------------------------------------------------------------- %files %defattr(-,root,root,-) %{inputplugindir}/libmpg123.so # -------------------------------------------------------------------- %changelog * Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.2.10-6 - rebuild * Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 1.2.10-5 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 * Fri Apr 7 2006 Dams <anvil[AT]livna.org> - 1.2.10-4 - Requires: xmms-libs instead of xmms, according to change in FE * 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 * Fri Dec 31 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> 0:1.2.10-0.lvn.3 - fix x86_64 build; inside mach the integrated libtool does not work * Sun May 16 2004 Dams <anvil[AT]livna.org> 0:1.2.10-0.lvn.2 - Added URL to Source0 * Wed Feb 25 2004 Dams <anvil[AT]livna.org> 0:1.2.10-0.lvn.1 - Updated to 1.2.10 * Fri Jan 30 2004 Dams <anvil[AT]livna.org> 0:1.2.9-0.lvn.1 - Updated to 1.2.9 * Tue Sep 30 2003 Dams <anvil[AT]livna.org> 0:1.2.8-0.fdr.2 - Fixed typo in description - Fixed typo in configure option * Sat Sep 27 2003 Dams <anvil[AT]livna.org> 0:1.2.8-0.fdr.1 - Spec file cleanup - updated to xmms 1.2.8 for Fedora Core Test 2 - Using real xmms tarball * Mon Mar 31 2003 Dams <anvil[AT]livna.org> 0:1.2.7-0.fdr.4 - Removed URL in Source - Removed scriptlet %post %pre * Sun Mar 30 2003 Dams <anvil[AT]livna.org> 0.fdr.3 - Added Epoch - NPTL Patch applied even if we're on rh8 * Sun Mar 30 2003 Dams <anvil[AT]livna.org> - Fixed typo in name of the patch. - Included script to extract sources from xmms tarball * Wed Feb 19 2003 Dams <anvil[AT]livna.org> - Added 3dnow! support when target is athlon * Tue Feb 18 2003 Dams <anvil[AT]livna.org> - Based on the xmms 1.2.7-19.p spec file. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/xmms-mp3/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 16:57:08 -0000 1.1 +++ .cvsignore 4 Aug 2008 18:33:03 -0000 1.2 @@ -0,0 +1 @@ +xmms-1.2.10.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/xmms-mp3/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:57:08 -0000 1.1 +++ sources 4 Aug 2008 18:33:03 -0000 1.2 @@ -0,0 +1 @@ +03a85cfc5e1877a2e1f7be4fa1d3f63c xmms-1.2.10.tar.bz2

16 years, 3 months

1
0
0 / 0

rpms/xmms-mp3/F-8 xmms-mp3.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

by Thorsten Leemhuis

Author: thl Update of /cvs/free/rpms/xmms-mp3/F-8 In directory se02.es.rpmfusion.net:/tmp/cvs-serv19714 Modified Files: .cvsignore sources Added Files: xmms-mp3.spec Log Message: initial import from livna --- NEW FILE xmms-mp3.spec --- %define inputplugindir %(xmms-config --input-plugin-dir 2>/dev/null) %define xmmsepoch 1 Summary: MP3 output plugin for XMMS Name: xmms-mp3 Version: 1.2.10 Release: 6%{?dist} License: GPL Group: Applications/Multimedia URL: http://www.xmms.org/ Source: http://www.xmms.org/files/1.2.x/xmms-%{version}.tar.bz2 Requires: xmms-libs = %{xmmsepoch}:%{version} BuildRequires: gtk+-devel glib-devel BuildRequires: xmms-devel = %{xmmsepoch}:%{version} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot %ifarch x86_64 BuildRequires: libtool %endif # -------------------------------------------------------------------- %description XMMS is a multimedia (Ogg Vorbis, CDs) player for the X Window System with an interface similar to Winamp's. XMMS supports playlists and streaming content and has a configurable interface. This is the output plugin needed to play MP3 audio files. # -------------------------------------------------------------------- %prep %setup -q -n xmms-%{version} # -------------------------------------------------------------------- %build %configure \ %ifarch athlon i686 --enable-simd \ %endif --enable-kanji --enable-texthack --enable-arts-shared perl -pi -e 's#\$$top_builddir$/libxmms/libxmms.la##g' Input/mpg123/Makefile make -C Input/mpg123 \ %ifarch x86_64 LIBTOOL=/usr/bin/libtool \ %endif %{?_smp_mflags} # -------------------------------------------------------------------- %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{inputplugindir} install -p -m 0755 Input/mpg123/.libs/libmpg123.so $RPM_BUILD_ROOT%{inputplugindir} # -------------------------------------------------------------------- %clean rm -rf $RPM_BUILD_ROOT # -------------------------------------------------------------------- %files %defattr(-,root,root,-) %{inputplugindir}/libmpg123.so # -------------------------------------------------------------------- %changelog * Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.2.10-6 - rebuild * Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 1.2.10-5 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 * Fri Apr 7 2006 Dams <anvil[AT]livna.org> - 1.2.10-4 - Requires: xmms-libs instead of xmms, according to change in FE * 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 * Fri Dec 31 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> 0:1.2.10-0.lvn.3 - fix x86_64 build; inside mach the integrated libtool does not work * Sun May 16 2004 Dams <anvil[AT]livna.org> 0:1.2.10-0.lvn.2 - Added URL to Source0 * Wed Feb 25 2004 Dams <anvil[AT]livna.org> 0:1.2.10-0.lvn.1 - Updated to 1.2.10 * Fri Jan 30 2004 Dams <anvil[AT]livna.org> 0:1.2.9-0.lvn.1 - Updated to 1.2.9 * Tue Sep 30 2003 Dams <anvil[AT]livna.org> 0:1.2.8-0.fdr.2 - Fixed typo in description - Fixed typo in configure option * Sat Sep 27 2003 Dams <anvil[AT]livna.org> 0:1.2.8-0.fdr.1 - Spec file cleanup - updated to xmms 1.2.8 for Fedora Core Test 2 - Using real xmms tarball * Mon Mar 31 2003 Dams <anvil[AT]livna.org> 0:1.2.7-0.fdr.4 - Removed URL in Source - Removed scriptlet %post %pre * Sun Mar 30 2003 Dams <anvil[AT]livna.org> 0.fdr.3 - Added Epoch - NPTL Patch applied even if we're on rh8 * Sun Mar 30 2003 Dams <anvil[AT]livna.org> - Fixed typo in name of the patch. - Included script to extract sources from xmms tarball * Wed Feb 19 2003 Dams <anvil[AT]livna.org> - Added 3dnow! support when target is athlon * Tue Feb 18 2003 Dams <anvil[AT]livna.org> - Based on the xmms 1.2.7-19.p spec file. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/xmms-mp3/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 16:57:08 -0000 1.1 +++ .cvsignore 4 Aug 2008 18:32:45 -0000 1.2 @@ -0,0 +1 @@ +xmms-1.2.10.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/xmms-mp3/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:57:08 -0000 1.1 +++ sources 4 Aug 2008 18:32:45 -0000 1.2 @@ -0,0 +1 @@ +03a85cfc5e1877a2e1f7be4fa1d3f63c xmms-1.2.10.tar.bz2

16 years, 3 months

1
0
0 / 0

rpms/normalize/F-8 normalize.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

by Thorsten Leemhuis

Author: thl Update of /cvs/free/rpms/normalize/F-8 In directory se02.es.rpmfusion.net:/tmp/cvs-serv19592 Modified Files: .cvsignore sources Added Files: normalize.spec Log Message: initial import from livna --- NEW FILE normalize.spec --- %define plugindir %(xmms-config --effect-plugin-dir 2>/dev/null) Summary: Tool for adjusting the volume of audio files to a standard level Name: normalize Version: 0.7.7 Release: 4%{?dist} URL: http://normalize.nongnu.org/ License: GPLv2+ Group: Applications/Multimedia Source: http://savannah.nongnu.org/download/normalize/normalize-0.7.7.tar.bz2 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: audiofile-devel >= 1:0.2.1-2, libmad-devel BuildRequires: gettext # Binaries from the following are required. BuildRequires: lame, vorbis-tools # Explicit, because won't be detected automatically. Requires: lame, vorbis-tools %ifarch x86_64 BuildRequires: libtool %endif %description normalize is a tool for adjusting the volume of audio files to a standard level. This is useful for things like creating mixed CDs and mp3 collections, where different recording levels on different albums can cause the volume to vary greatly from song to song. %package -n xmms-%{name} Summary: Relative volume adjustment plugin for XMMS Group: Applications/Multimedia BuildRequires: xmms-devel, gtk+-devel Requires: xmms-libs, %{name} = %{version}-%{release} %description -n xmms-%{name} Plugin for XMMS to honour relative volume adjustment (RVA2) ID3 tag frames. %prep %setup -q %build %configure --enable-xmms --with-mad --with-audiofile make \ %ifarch x86_64 LIBTOOL=/usr/bin/libtool \ %endif %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root) %doc COPYING README NEWS THANKS TODO %{_bindir}/normalize %{_bindir}/normalize-mp3 %{_bindir}/normalize-ogg %{_mandir}/man1/normalize.1.gz %{_mandir}/man1/normalize-mp3.1.gz %files -n xmms-%{name} %defattr(-,root,root) %{plugindir}/librva.so %exclude %{_libdir}/xmms/Effect/librva.*a # The * here is for x86_64 build where a librva.a and a librva.la are builded %changelog * Mon Aug 04 2008 David Timms <iinet.net.au [AT] dtimms> 0.7.7-4 - mod BR: to libmad, del Requires: mad * Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.7.7-3 - rebuild * Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.7.7-2 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 * Sun Sep 24 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.7.7-1 - Update to 0.7.7 (new upstream locations). * Fri Apr 7 2006 Dams <anvil[AT]livna.org> - 0.7.6-11 - xmms package requires xmms-libs instead of xmms * Mon Mar 13 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> 0.7.6-10 - Drop Epoch completely * 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 * Fri Dec 31 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> 0:0.7.6-0.lvn.9 - fix x86_64 build; inside mach the integrated libtool does not work * Thu May 20 2004 Dams <anvil[AT]livna.org> - 0:0.7.6-0.lvn.8 - xmms-config errors redirected to dev/null * Sun May 4 2003 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:0.7.6-0.fdr.7 - Use $RPM_BUILD_ROOT instead of %{buildroot}. - Fix spec file in accordance with bug #213 comments #14 and #15. * Sun Apr 27 2003 Michael Schwendt <mschwendt[AT]users.sf.net> - Rename package normalize-xmms to xmms-normalize. - Use explicit Epoch 1 for versioned audiofile, drop version requirement for xmms. * Sat Apr 26 2003 Michael Schwendt <mschwendt[AT]users.sf.net> - Drop explicit Requires where possible. - Update for split "mad" packages (bug #187). * Fri Apr 25 2003 Michael Schwendt <mschwendt[AT]users.sf.net> - Update spec file according to Fedora package request bug #213. * Sat Apr 5 2003 Michael Schwendt <mschwendt[AT]users.sf.net> - Depend on libmad-*. - RHL9 build. * Sun Apr 14 2002 Michael Schwendt <mschwendt[AT]users.sf.net> - Initial RPM built for Red Hat Linux 7.2. - Wants libaudiofile >= 0.2.2, but 0.2.1-2 seems to work. and passes tests, too. - Descriptions taken from Chris Vaill's spec file. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/normalize/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 29 Jul 2008 18:14:14 -0000 1.1 +++ .cvsignore 4 Aug 2008 18:32:04 -0000 1.2 @@ -0,0 +1 @@ +normalize-0.7.7.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/normalize/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 29 Jul 2008 18:14:14 -0000 1.1 +++ sources 4 Aug 2008 18:32:04 -0000 1.2 @@ -0,0 +1 @@ +1749b16fc7a08aa5d0cf9f76eeaa8436 normalize-0.7.7.tar.bz2

16 years, 3 months

1
0
0 / 0

rpms/normalize/F-9 normalize.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

by Thorsten Leemhuis

Author: thl Update of /cvs/free/rpms/normalize/F-9 In directory se02.es.rpmfusion.net:/tmp/cvs-serv19464 Modified Files: .cvsignore sources Added Files: normalize.spec Log Message: initial import from livna --- NEW FILE normalize.spec --- %define plugindir %(xmms-config --effect-plugin-dir 2>/dev/null) Summary: Tool for adjusting the volume of audio files to a standard level Name: normalize Version: 0.7.7 Release: 4%{?dist} URL: http://normalize.nongnu.org/ License: GPLv2+ Group: Applications/Multimedia Source: http://savannah.nongnu.org/download/normalize/normalize-0.7.7.tar.bz2 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: audiofile-devel >= 1:0.2.1-2, libmad-devel BuildRequires: gettext # Binaries from the following are required. BuildRequires: lame, vorbis-tools # Explicit, because won't be detected automatically. Requires: lame, vorbis-tools %ifarch x86_64 BuildRequires: libtool %endif %description normalize is a tool for adjusting the volume of audio files to a standard level. This is useful for things like creating mixed CDs and mp3 collections, where different recording levels on different albums can cause the volume to vary greatly from song to song. %package -n xmms-%{name} Summary: Relative volume adjustment plugin for XMMS Group: Applications/Multimedia BuildRequires: xmms-devel, gtk+-devel Requires: xmms-libs, %{name} = %{version}-%{release} %description -n xmms-%{name} Plugin for XMMS to honour relative volume adjustment (RVA2) ID3 tag frames. %prep %setup -q %build %configure --enable-xmms --with-mad --with-audiofile make \ %ifarch x86_64 LIBTOOL=/usr/bin/libtool \ %endif %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root) %doc COPYING README NEWS THANKS TODO %{_bindir}/normalize %{_bindir}/normalize-mp3 %{_bindir}/normalize-ogg %{_mandir}/man1/normalize.1.gz %{_mandir}/man1/normalize-mp3.1.gz %files -n xmms-%{name} %defattr(-,root,root) %{plugindir}/librva.so %exclude %{_libdir}/xmms/Effect/librva.*a # The * here is for x86_64 build where a librva.a and a librva.la are builded %changelog * Mon Aug 04 2008 David Timms <iinet.net.au [AT] dtimms> 0.7.7-4 - mod BR: to libmad, del Requires: mad * Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.7.7-3 - rebuild * Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.7.7-2 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 * Sun Sep 24 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.7.7-1 - Update to 0.7.7 (new upstream locations). * Fri Apr 7 2006 Dams <anvil[AT]livna.org> - 0.7.6-11 - xmms package requires xmms-libs instead of xmms * Mon Mar 13 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> 0.7.6-10 - Drop Epoch completely * 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 * Fri Dec 31 2004 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> 0:0.7.6-0.lvn.9 - fix x86_64 build; inside mach the integrated libtool does not work * Thu May 20 2004 Dams <anvil[AT]livna.org> - 0:0.7.6-0.lvn.8 - xmms-config errors redirected to dev/null * Sun May 4 2003 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:0.7.6-0.fdr.7 - Use $RPM_BUILD_ROOT instead of %{buildroot}. - Fix spec file in accordance with bug #213 comments #14 and #15. * Sun Apr 27 2003 Michael Schwendt <mschwendt[AT]users.sf.net> - Rename package normalize-xmms to xmms-normalize. - Use explicit Epoch 1 for versioned audiofile, drop version requirement for xmms. * Sat Apr 26 2003 Michael Schwendt <mschwendt[AT]users.sf.net> - Drop explicit Requires where possible. - Update for split "mad" packages (bug #187). * Fri Apr 25 2003 Michael Schwendt <mschwendt[AT]users.sf.net> - Update spec file according to Fedora package request bug #213. * Sat Apr 5 2003 Michael Schwendt <mschwendt[AT]users.sf.net> - Depend on libmad-*. - RHL9 build. * Sun Apr 14 2002 Michael Schwendt <mschwendt[AT]users.sf.net> - Initial RPM built for Red Hat Linux 7.2. - Wants libaudiofile >= 0.2.2, but 0.2.1-2 seems to work. and passes tests, too. - Descriptions taken from Chris Vaill's spec file. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/normalize/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 29 Jul 2008 18:14:14 -0000 1.1 +++ .cvsignore 4 Aug 2008 18:31:51 -0000 1.2 @@ -0,0 +1 @@ +normalize-0.7.7.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/normalize/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 29 Jul 2008 18:14:14 -0000 1.1 +++ sources 4 Aug 2008 18:31:51 -0000 1.2 @@ -0,0 +1 @@ +1749b16fc7a08aa5d0cf9f76eeaa8436 normalize-0.7.7.tar.bz2

16 years, 3 months

1
0
0 / 0

rpms/libmpeg3/F-8 libmpeg3-1.5.2-gnustack.patch, NONE, 1.1 libmpeg3-1.7-boostrap.patch, NONE, 1.1 libmpeg3-1.7-cinelerra_autotools.patch, NONE, 1.1 libmpeg3-1.7-cinelerra_hacking.patch, NONE, 1.1 libmpeg3-1.7-fix_commented.patch, NONE, 1.1 libmpeg3-1.7-makefile.patch, NONE, 1.1 libmpeg3-1.7-memcpy.patch, NONE, 1.1 libmpeg3-1.7-pkgconfig.in.patch, NONE, 1.1 libmpeg3-1.7-spec_in.patch, NONE, 1.1 libmpeg3.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

by Thorsten Leemhuis

Author: thl Update of /cvs/free/rpms/libmpeg3/F-8 In directory se02.es.rpmfusion.net:/tmp/cvs-serv19324 Modified Files: .cvsignore sources Added Files: libmpeg3-1.5.2-gnustack.patch libmpeg3-1.7-boostrap.patch libmpeg3-1.7-cinelerra_autotools.patch libmpeg3-1.7-cinelerra_hacking.patch libmpeg3-1.7-fix_commented.patch libmpeg3-1.7-makefile.patch libmpeg3-1.7-memcpy.patch libmpeg3-1.7-pkgconfig.in.patch libmpeg3-1.7-spec_in.patch libmpeg3.spec Log Message: initial import from livna libmpeg3-1.5.2-gnustack.patch: --- NEW FILE libmpeg3-1.5.2-gnustack.patch --- diff -ru libmpeg3-1.5.2.orig/video/mmxidct.S libmpeg3-1.5.2/video/mmxidct.S --- libmpeg3-1.5.2.orig/video/mmxidct.S 2006-04-24 23:13:14.000000000 +0200 +++ libmpeg3-1.5.2/video/mmxidct.S 2006-04-24 23:13:47.000000000 +0200 @@ -673,3 +673,7 @@ ret .Lfe1: .size IDCT_mmx,.Lfe1-IDCT_mmx + +#ifdef __ELF__ +.section .note.GNU-stack,"",%progbits +#endif diff -ru libmpeg3-1.5.2.orig/video/reconmmx.s libmpeg3-1.5.2/video/reconmmx.s --- libmpeg3-1.5.2.orig/video/reconmmx.s 2006-04-24 23:13:14.000000000 +0200 +++ libmpeg3-1.5.2/video/reconmmx.s 2006-04-24 23:13:20.000000000 +0200 @@ -298,4 +298,6 @@ pop esi ret - +%ifidn __OUTPUT_FORMAT__,elf +section .note.GNU-stack noalloc noexec nowrite progbits +%endif libmpeg3-1.7-boostrap.patch: --- NEW FILE libmpeg3-1.7-boostrap.patch --- diff -uNr libmpeg3-1.7-bootstrap/bootstrap libmpeg3-1.7/bootstrap --- libmpeg3-1.7-bootstrap/bootstrap 1970-01-01 01:00:00.000000000 +0100 +++ libmpeg3-1.7/bootstrap 2007-09-14 00:27:39.000000000 +0200 @@ -0,0 +1,7 @@ +#!/bin/sh +set -x +aclocal +libtoolize --force --copy +autoheader +automake --add-missing --copy +autoconf libmpeg3-1.7-cinelerra_autotools.patch: --- NEW FILE libmpeg3-1.7-cinelerra_autotools.patch --- diff -uNr libmpeg3-1.7/audio/ac3.c libmpeg3-cinelerra/audio/ac3.c --- libmpeg3-1.7/audio/ac3.c 2006-01-11 05:42:23.000000000 +0100 +++ libmpeg3-cinelerra/audio/ac3.c 2007-07-05 00:42:40.000000000 +0200 @@ -1,7 +1,7 @@ #include <stdint.h> #include <stdio.h> -#include "a52.h" +#include <a52dec/a52.h> #include "mpeg3private.h" #include "mpeg3protos.h" diff -uNr libmpeg3-1.7/audio/Makefile.am libmpeg3-cinelerra/audio/Makefile.am --- libmpeg3-1.7/audio/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ libmpeg3-cinelerra/audio/Makefile.am 2007-07-05 00:42:40.000000000 +0200 @@ -0,0 +1,12 @@ +noinst_LTLIBRARIES = libmpeg3_audio.la +libmpeg3_audio_la_SOURCES = ac3.c dct.c huffman.c layer2.c layer3.c mpeg3audio.c pcm.c synthesizers.c tables.c +libmpeg3_audio_la_LDFLAGS = + +noinst_HEADERS = ac3.h huffman.h mpeg3audio.h tables.h + +AM_CFLAGS = $(CPU_CFLAGS) $(LARGEFILE_CFLAGS) +AM_CXXFLAGS = $(CPU_CFLAGS) $(LARGEFILE_CFLAGS) +INCLUDES=-I$(srcdir)/.. + +LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTC_FLAGS) + diff -uNr libmpeg3-1.7/configure.in libmpeg3-cinelerra/configure.in --- libmpeg3-1.7/configure.in 1970-01-01 01:00:00.000000000 +0100 +++ libmpeg3-cinelerra/configure.in 2007-09-08 23:27:17.000000000 +0200 @@ -0,0 +1,83 @@ +# Process this file with autoconf to produce a configure script. +AC_INIT(libmpeg3, 1.7) +AM_INIT_AUTOMAKE([dist-bzip2]) +AC_PREREQ(2.53) +AM_CONFIG_HEADER([config.h]) +AM_PROG_AS +AC_DISABLE_SHARED +AC_ENABLE_STATIC +AC_PROG_LIBTOOL + +LIBMPEG3_VERSION_CURRENT=1 +LIBMPEG3_VERSION_REVISION=0 +LIBMPEG3_VERSION_AGE=0 +LIBMPEG3_VERSION_INFO=$LIBMPEG3_VERSION_CURRENT:$LIBMPEG3_VERSION_REVISION:$LIBMPEG3_VERSION_AGE +AC_SUBST(LIBMPEG3_VERSION_INFO) + +# Checks for programs. +AC_PROG_CC + +# hack for using nasm for .S files +CCAS="nasm --tag=$CC" +AC_SUBST(CCAS) +AC_SUBST(CCASFLAGS) + +############## MMX + +AC_ARG_ENABLE(mmx, + AC_HELP_STRING([--enable-mmx], [enables support for mmx (default is autodetect)]), + [ enable_mmx=$enableval ],[ enable_mmx=auto ]) +case "$target_cpu" in +i586 | i686) + test "x$enable_mmx" = "xauto" && enable_mmx=yes + + CPU_CFLAGS="-DX86_CPU $CPU_CFLAGS" + + if test "x$enable_mmx" = "xyes"; then + CPU_CFLAGS="-DHAVE_MMX -DUSE_MMX $CPU_CFLAGS" # -D_MMX_ doesn't work + enable_mmx32=yes + fi +;; +x86_64) + test "x$enable_mmx" = "xauto" && enable_mmx=yes + CPU_CFLAGS="-DX86_CPU $CPU_CFLAGS" + if test "x$enable_mmx" = "xyes"; then + CPU_CFLAGS="-DHAVE_MMX -DUSE_MMX $CPU_CFLAGS" + + fi +;; +esac + +test "x$enable_mmx" = "xauto" && enable_mmx=no + +AM_CONDITIONAL(USEMMX, test "x$enable_mmx" = "xyes") +AM_CONDITIONAL(USEMMX32, test "x$enable_mmx32" = "xyes") +AM_CONDITIONAL(TARGET_BUILTIN_VECTOR,test "x$enable_mmx" = "xyes") +AC_SUBST(LIBDECORE_LIBADD) +AC_SUBST(CPU_CFLAGS) + +############## END OF MMX + +LARGEFILE_CFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" +AC_SUBST(LARGEFILE_CFLAGS) + +# Checks for header files. +AC_HEADER_STDC +AC_CHECK_HEADERS([stdlib.h string.h]) + +# Checks for typedefs, structures, and compiler characteristics. +AC_C_CONST +AC_C_INLINE +AC_STRUCT_TM + +# Checks for libraries. + +AC_CONFIG_FILES([ +Makefile +audio/Makefile +video/Makefile +libmpeg3.spec +libmpeg3.pc +]) +AC_OUTPUT + diff -uNr libmpeg3-1.7/Makefile.am libmpeg3-cinelerra/Makefile.am --- libmpeg3-1.7/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ libmpeg3-cinelerra/Makefile.am 2007-09-08 22:58:17.000000000 +0200 @@ -0,0 +1,61 @@ +lib_LTLIBRARIES = libmpeg3.la +AM_CFLAGS = $(CPU_CFLAGS) $(LARGEFILE_CFLAGS) +libmpeg3_la_LDFLAGS = -version-info @LIBMPEG3_VERSION_INFO@ +libmpeg3_la_LIBADD = -la52 video/libmpeg3_video.la audio/libmpeg3_audio.la -lm \ + -lpthread +libmpeg3_la_SOURCES = libmpeg3.c mpeg3bits.c mpeg3atrack.c mpeg3css.c \ + mpeg3demux.c \ + mpeg3ifo.c \ + mpeg3io.c \ + mpeg3strack.c \ + mpeg3title.c \ + mpeg3tocutil.c \ + mpeg3vtrack.c \ + workarounds.c + +bin_PROGRAMS = mpeg3dump mpeg3peek mpeg3toc mpeg3cat # mpeg2qt +mpeg3dump_SOURCES = mpeg3dump.c +mpeg3dump_LDADD = libmpeg3.la +mpeg3dump_CFLAGS = $(AM_CFLAGS) +mpeg3peek_SOURCES = mpeg3peek.c +mpeg3peek_LDADD = libmpeg3.la +mpeg3peek_CFLAGS = $(AM_CFLAGS) +mpeg3toc_SOURCES = mpeg3toc.c +mpeg3toc_LDADD = libmpeg3.la +mpeg3toc_CFLAGS = $(AM_CFLAGS) +mpeg3cat_SOURCES = mpeg3cat.c +mpeg3cat_LDADD = libmpeg3.la +mpeg3cat_CFLAGS = $(AM_CFLAGS) +#mpeg2qt_SOURCES = mpeg2qt.c # disabled to prevent circle dependencies +#mpeg2qt_LDADD = libmpeg3.la -lpng -lz -ldl -lquicktime4linux +#mpeg2qt_CFLAGS = $(AM_CFLAGS) -I$(includedir)/quicktime4linux + +SUBDIRS = audio video + +EXTRA_DIST = docs + +noinst_HEADERS = bitstream.h \ + ifo.h \ + libmpeg3.h \ + mpeg3atrack.h \ + mpeg3css.h \ + mpeg3css_fake.c \ + mpeg3demux.h \ + mpeg3io.h \ + mpeg3private.h \ + mpeg3private.inc \ + mpeg3protos.h \ + mpeg3title.h \ + mpeg3vtrack.h \ + timecode.h \ + workarounds.h + +dist_noinst_SCRIPTS = bootstrap + +pkgincludedir=$(includedir)/mpeg3 +pkginclude_HEADERS=libmpeg3.h mpeg3private.h + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = libmpeg3.pc + +LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTC_FLAGS) diff -uNr libmpeg3-1.7/video/Makefile.am libmpeg3-cinelerra/video/Makefile.am --- libmpeg3-1.7/video/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ libmpeg3-cinelerra/video/Makefile.am 2007-07-05 00:42:40.000000000 +0200 @@ -0,0 +1,29 @@ +noinst_LTLIBRARIES = libmpeg3_video.la +libmpeg3_video_la_SOURCES = getpicture.c headers.c idct.c macroblocks.c mmxtest.c motion.c \ + mpeg3cache.c \ + mpeg3video.c \ + output.c \ + reconstruct.c \ + seek.c \ + slice.c \ + subtitle.c \ + vlc.c + +if USEMMX +libmpeg3_video_la_SOURCES += mmxidct.S reconmmx.s +else +libmpeg3_video_la_SOURCES += +endif + +noinst_HEADERS = idct.h \ + layerdata.h \ + mpeg3video.h \ + mpeg3videoprotos.h \ + slice.h \ + vlc.h + +libmpeg3_video_la_LDFLAGS= +AM_CFLAGS = $(CPU_CFLAGS) $(LARGEFILE_CFLAGS) +INCLUDES=-I$(srcdir)/.. + +LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTC_FLAGS) libmpeg3-1.7-cinelerra_hacking.patch: --- NEW FILE libmpeg3-1.7-cinelerra_hacking.patch --- diff -uNr libmpeg3-1.7/libmpeg3.c libmpeg3-cinelerra/libmpeg3.c --- libmpeg3-1.7/libmpeg3.c 2006-03-29 06:14:26.000000000 +0200 +++ libmpeg3-cinelerra/libmpeg3.c 2007-07-05 00:42:40.000000000 +0200 @@ -181,6 +181,7 @@ strncasecmp(ext, ".mpg", 4) && strncasecmp(ext, ".vob", 4) && strncasecmp(ext, ".mpeg", 4) && + strncasecmp(ext, ".m2t", 4) && strncasecmp(ext, ".ac3", 4)) result = 0; } diff -uNr libmpeg3-1.7/libmpeg3.h libmpeg3-cinelerra/libmpeg3.h --- libmpeg3-1.7/libmpeg3.h 2006-03-29 06:14:26.000000000 +0200 +++ libmpeg3-cinelerra/libmpeg3.h 2007-07-05 00:42:40.000000000 +0200 @@ -5,6 +5,7 @@ extern "C" { #endif +// FIXME: don't include private definitions in external header #include "mpeg3private.h" diff -uNr libmpeg3-1.7/mpeg3toc.c libmpeg3-cinelerra/mpeg3toc.c --- libmpeg3-1.7/mpeg3toc.c 2005-12-23 23:54:55.000000000 +0100 +++ libmpeg3-cinelerra/mpeg3toc.c 2007-07-05 00:42:40.000000000 +0200 @@ -574,7 +574,7 @@ if(j == vtracks - 1 && l == frame_count - 1) { total_frames += frame_count; - fprintf(stderr, "Video: title=%lld total_frames=%d ", title_number, total_frames); + fprintf(stderr, "Video: title=%lld total_frames=%d (%.1f \%)", title_number, total_frames,100*((float)position)/((float) mpeg3demux_movie_size(demuxer))); } } } diff -uNr libmpeg3-1.7/video/output.c libmpeg3-cinelerra/video/output.c --- libmpeg3-1.7/video/output.c 2006-01-07 10:55:56.000000000 +0100 +++ libmpeg3-cinelerra/video/output.c 2007-07-05 00:42:40.000000000 +0200 @@ -104,7 +104,7 @@ *data++ = 0; #define STORE_PIXEL_RGB565 \ - *((unsigned short*)data) = \ + *(*(unsigned short**)(&data))++ = \ ((CLIP(r_l) & 0xf8) << 8) | \ ((CLIP(g_l) & 0xfc) << 3) | \ ((CLIP(b_l) & 0xf8) >> 3); \ diff -uNr libmpeg3-1.7/video/vlc.c libmpeg3-cinelerra/video/vlc.c --- libmpeg3-1.7/video/vlc.c 2005-04-21 05:59:42.000000000 +0200 +++ libmpeg3-cinelerra/video/vlc.c 2007-07-05 00:42:40.000000000 +0200 @@ -1,3 +1,6 @@ +// FIXME: vlc.h redefines ERROR to 99 if and only if error is defined. +#define ERROR + #include "mpeg3private.h" #include "mpeg3protos.h" #include "vlc.h" libmpeg3-1.7-fix_commented.patch: --- NEW FILE libmpeg3-1.7-fix_commented.patch --- diff -up libmpeg3-1.7/mpeg3protos.h.commented libmpeg3-1.7/mpeg3protos.h --- libmpeg3-1.7/mpeg3protos.h.commented 2006-03-29 06:14:26.000000000 +0200 +++ libmpeg3-1.7/mpeg3protos.h 2007-09-11 18:20:08.000000000 +0200 @@ -390,7 +390,7 @@ int mpeg3demux_open_title(mpeg3_demuxer_ /* Go to the absolute byte given */ int mpeg3demux_seek_byte(mpeg3_demuxer_t *demuxer, int64_t byte); -/* Seek to the title and cell containing the absolute byte of the +/* Seek to the title and cell containing the absolute byte of the */ /* demuxer. */ /* Called at the beginning of every packet. */ int mpeg3_seek_phys(mpeg3_demuxer_t *demuxer); libmpeg3-1.7-makefile.patch: --- NEW FILE libmpeg3-1.7-makefile.patch --- diff -up libmpeg3-1.7/Makefile.makefile libmpeg3-1.7/Makefile --- libmpeg3-1.7/Makefile.makefile 2006-02-15 06:09:31.000000000 +0100 +++ libmpeg3-1.7/Makefile 2007-09-08 03:16:05.000000000 +0200 @@ -9,6 +9,10 @@ ifeq ("$(PREFIX)", "") PREFIX=/usr endif +ifeq ("$(LIBDIR)", "") +LIBDIR=$(PREFIX)/lib +endif + ifeq ($(origin CFLAGS), environment) HAVE_CFLAGS := y else @@ -16,36 +20,13 @@ HAVE_CFLAGS := n endif +ifeq ("$(OBJDIR)", "") OBJDIR := $(shell uname --machine) - - - - -ifeq ($(OBJDIR), alpha) - USE_MMX = 0 - ifneq ($(HAVE_CFLAGS), y) - CFLAGS := -O4 -arch ev67 -ieee -accept c99_keywords -gcc_messages - endif -endif - -ifeq ($(OBJDIR), i686) - USE_MMX = 1 - ifneq ($(HAVE_CFLAGS), y) - CFLAGS := -O2 -fomit-frame-pointer -falign-loops=2 -falign-jumps=2 -falign-functions=2 -I/usr/local/include - endif - CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -endif - -ifeq ($(OBJDIR), x86_64) - ifneq ($(HAVE_CFLAGS), y) - CFLAGS := -O2 -fomit-frame-pointer -I/usr/local/include - endif - CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE - - endif +CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE + ifeq ($(USE_CSS), 1) CFLAGS += -DHAVE_CSS @@ -64,8 +45,7 @@ endif CFLAGS += \ -I. \ - -I$(A52DIR)/include \ - -I$(A52DIR)/liba52 + -I/usr/include/a52dec @@ -136,9 +116,9 @@ DIRS := \ $(OBJDIR)/audio \ $(OBJDIR)/video -include Makefile.a52 +#include Makefile.a52 -DIRS += $(A52DIRS) +#DIRS += $(A52DIRS) OUTPUT = $(OBJDIR)/libmpeg3.a @@ -147,40 +127,40 @@ UTILS = $(OBJDIR)/mpeg3dump $(OBJDIR)/mp #$(OBJDIR)/mpeg3split -LIBS = -lm -lpthread +LIBS = -lm -lpthread -la52 $(shell if ! test -d $(OBJDIR) \; then mkdir -p $(OBJDIR) \; fi ) -$(shell echo $(CFLAGS) > $(OBJDIR)/c_flags) -$(shell echo $(A52CFLAGS) > $(OBJDIR)/a52_flags) -$(shell echo $(OBJS) $(ASMOBJS) $(A52OBJS) $(NASMOBJS) > $(OBJDIR)/objs) +#(shell echo $(CFLAGS) > $(OBJDIR)/c_flags) +#$(shell echo $(A52CFLAGS) > $(OBJDIR)/a52_flags) +#$(shell echo $(OBJS) $(ASMOBJS) $(NASMOBJS) > $(OBJDIR)/objs) $(shell mkdir -p $(DIRS) ) all: $(OUTPUT) $(UTILS) -$(OUTPUT): $(OBJS) $(ASMOBJS) $(NASMOBJS) $(A52OBJS) - ar rcs $(OUTPUT) `cat $(OBJDIR)/objs` +$(OUTPUT): $(OBJS) $(ASMOBJS) $(NASMOBJS) + ar rcs $(OUTPUT) $(OBJS) $(ASMOBJS) $(NASMOBJS) $(OBJDIR)/mpeg3dump: $(OUTPUT) mpeg3dump.c - $(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3dump mpeg3dump.c $(OUTPUT) $(LIBS) + $(CC) $(CFLAGS) -o $(OBJDIR)/mpeg3dump mpeg3dump.c $(OUTPUT) $(LIBS) $(OBJDIR)/mpeg3peek: $(OUTPUT) mpeg3peek.c - $(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3peek mpeg3peek.c $(OUTPUT) $(LIBS) + $(CC) $(CFLAGS) -o $(OBJDIR)/mpeg3peek mpeg3peek.c $(OUTPUT) $(LIBS) $(OBJDIR)/mpeg3toc: $(OUTPUT) mpeg3toc.c - $(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3toc mpeg3toc.c $(OUTPUT) $(LIBS) + $(CC) $(CFLAGS) -o $(OBJDIR)/mpeg3toc mpeg3toc.c $(OUTPUT) $(LIBS) $(OBJDIR)/mpeg3cat: $(OUTPUT) mpeg3cat.c - $(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3cat mpeg3cat.c $(OUTPUT) $(LIBS) + $(CC) $(CFLAGS) -o $(OBJDIR)/mpeg3cat mpeg3cat.c $(OUTPUT) $(LIBS) #$(OBJDIR)/mpeg3split: $(OUTPUT) -# $(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3split mpeg3split.c $(OUTPUT) $(LIBS) +# $(CC) $(CFLAGS) -o $(OBJDIR)/mpeg3split mpeg3split.c $(OUTPUT) $(LIBS) $(OBJDIR)/mpeg2qt: $(OUTPUT) - $(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg2qt mpeg2qt.c \ + $(CC) $(CFLAGS) -o $(OBJDIR)/mpeg2qt mpeg2qt.c \ $(OUTPUT) \ $(LIBS) \ -I. \ @@ -191,9 +171,12 @@ $(OBJDIR)/mpeg2qt: $(OUTPUT) -ldl install: - cp $(UTILS) $(PREFIX)/bin -# cp $(OUTPUT) $(PREFIX)/lib -# cp libmpeg3.h mpeg3private.h $(PREFIX)/include + mkdir -p $(DESTDIR)$(PREFIX)/bin + cp $(UTILS) $(DESTDIR)$(PREFIX)/bin + mkdir -p $(DESTDIR)$(LIBDIR) + cp $(OUTPUT) $(DESTDIR)$(LIBDIR) + mkdir -p $(DESTDIR)$(PREFIX)/include + cp libmpeg3.h mpeg3private.h $(DESTDIR)$(PREFIX)/include clean: rm -rf $(OBJDIR) @@ -206,13 +189,13 @@ wc: cat *.c *.h audio/*.c audio/*.h video/*.c video/*.h | wc $(OBJS): - $(CC) -c `cat $(OBJDIR)/c_flags` $(subst $(OBJDIR)/,, $*.c) -o $*.o + $(CC) -c $(CFLAGS) $(subst $(OBJDIR)/,, $*.c) -o $*.o $(ASMOBJS): - $(CC) -c `cat $(OBJDIR)/c_flags` $(subst $(OBJDIR)/,, $*.S) -o $*.o + $(CC) -c $(CFLAGS) $(subst $(OBJDIR)/,, $*.S) -o $*.o $(NASMOBJS): $(NASM) -f elf $(subst $(OBJDIR)/,, $*.s) -o $*.o -$(A52OBJS): - $(CC) -c `cat $(OBJDIR)/a52_flags` $(subst $(OBJDIR)/,, $*.c) -o $*.o +#(A52OBJS): +# $(CC) -c $(CFLAGS) $(subst $(OBJDIR)/,, $*.c) -o $*.o $(OBJDIR)/libmpeg3.o: libmpeg3.c $(OBJDIR)/mpeg3atrack.o: mpeg3atrack.c libmpeg3-1.7-memcpy.patch: --- NEW FILE libmpeg3-1.7-memcpy.patch --- diff -ur libmpeg3-1.7.orig/audio/mpeg3audio.c libmpeg3-1.7/audio/mpeg3audio.c --- libmpeg3-1.7.orig/audio/mpeg3audio.c 2006-02-19 13:43:27.000000000 +0200 +++ libmpeg3-1.7/audio/mpeg3audio.c 2007-08-17 18:06:37.000000000 +0300 @@ -3,7 +3,7 @@ #include <math.h> #include <stdlib.h> - +#include <string.h> diff -ur libmpeg3-1.7.orig/video/subtitle.c libmpeg3-1.7/video/subtitle.c --- libmpeg3-1.7.orig/video/subtitle.c 2006-02-27 06:14:00.000000000 +0200 +++ libmpeg3-1.7/video/subtitle.c 2007-08-17 18:07:00.000000000 +0300 @@ -2,6 +2,7 @@ #include "mpeg3protos.h" #include <stdlib.h> +#include <string.h> static unsigned char get_nibble(unsigned char **ptr, int *nibble) { libmpeg3-1.7-pkgconfig.in.patch: --- NEW FILE libmpeg3-1.7-pkgconfig.in.patch --- diff -uNr libmpeg3-1.7_spec/libmpeg3.pc.in libmpeg3-1.7/libmpeg3.pc.in --- libmpeg3-1.7_spec/libmpeg3.pc.in 1970-01-01 01:00:00.000000000 +0100 +++ libmpeg3-1.7/libmpeg3.pc.in 2007-09-11 22:08:28.000000000 +0200 @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@prefix@ +libdir=@libdir@ +includedir=@includedir@/mpeg3 + +Name: @PACKAGE@ +Description: Decoder of various derivatives of MPEG standards +Version: @VERSION@ +Requires: +Conflicts: +Libs: -L${libdir} -lmpeg3 -lpthread -la52 +Cflags: -I${includedir} libmpeg3-1.7-spec_in.patch: --- NEW FILE libmpeg3-1.7-spec_in.patch --- diff -uNr libmpeg3-1.7_spec/libmpeg3.spec.in libmpeg3-1.7/libmpeg3.spec.in --- libmpeg3-1.7_spec/libmpeg3.spec.in 1970-01-01 01:00:00.000000000 +0100 +++ libmpeg3-1.7/libmpeg3.spec.in 2007-09-11 21:34:13.000000000 +0200 @@ -0,0 +1,160 @@ +Summary: Decoder of various derivatives of MPEG standards +Name: libmpeg3 +Version: @VERSION@ +Release: 1%{?dist} +License: GPLv2+ +Group: System Environment/Libraries +URL: http://heroinewarrior.com/libmpeg3.php3 +Source: http://dl.sf.net/heroines/libmpeg3-%{version}-src.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +#BuildRequires: nasm +#BuildRequires: a52dec-devel + +#BuildRequires: autoconf, libtool, automake + +%description +LibMPEG3 decodes the many many derivatives of MPEG standards into +uncompressed data suitable for editing and playback. + +libmpeg3 currently decodes: + - MPEG-1 Layer II/III Audio and program streams + - MPEG-2 Layer III Audio, program streams and transport streams + - MPEG-1 and MPEG-2 Video + - AC3 Audio + - IFO files + - VOB files + + +%package utils +Summary: Utilities from libmpeg3 +Group: Applications/Multimedia +Requires: %{name} = %{version}-%{release} + +%description utils +LibMPEG3 decodes the many many derivatives of MPEG standards into +uncompressed data suitable for editing and playback. + +This package contains utility programs based on libmpeg3. + + +%package devel +Summary: Development files for libmpeg3 +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +LibMPEG3 decodes the many many derivatives of MPEG standards into +uncompressed data suitable for editing and playback. + +This package contains files needed to build applications that will use +libmpeg3. + + +%prep +%setup -q + + + + +%build +%configure --enable-shared --enable-static +%ifarch i686 x86_64 +# --enable-mmx \ +%endif + +make %{?_smp_mflags} + + + +%install +%{__rm} -rf %{buildroot} + +%{__make} install \ + LIBDIR=%{_libdir} \ + DESTDIR=%{buildroot} \ + INSTALL="install -c -p" + +%{__rm} -rf %{buildroot}%{_libdir}/*.la + + +%clean +%{__rm} -rf %{buildroot} + + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + + +%files +%defattr(-, root, root, -) +%doc COPYING +%{_libdir}/*.so.* + +%files utils +%defattr(-, root, root, -) +%{_bindir}/mpeg3cat +%{_bindir}/mpeg3dump +%{_bindir}/mpeg3peek +%{_bindir}/mpeg3toc +#{_bindir}/mpeg2qt + +%files devel +%defattr(-, root, root,-) +%doc docs/* +%{_libdir}/*.so +%{_libdir}/*.a +%{_includedir}/mpeg3/ +%{_libdir}/pkgconfig/*.pc + + +%changelog +* Sun Sep 9 2007 kwizart < kwizart at gmail.com > - 1.7-4 +- Add autotools support (default is still static ) +- Remove internal css +- Build with our cflags (-fPIC is no more necessary ) + +* Fri Sep 7 2007 kwizart < kwizart at gmail.com > - 1.7-3 +- Add dist tag +- modified patch for Makefile +- Add BR's + +* Wed Sep 20 2006 Matthias Saou <http://freshrpms.net/> 1.7-2 +- Run make twice since there is an EOF error that makes the first run abort. + +* Mon Jul 3 2006 Matthias Saou <http://freshrpms.net/> 1.7-1 +- Update to 1.7. + +* Fri Mar 17 2006 Matthias Saou <http://freshrpms.net/> 1.6-2 +- Add -fPIC to the CFLAGS to fix transcode build on x86_64. + +* Thu Jan 19 2006 Matthias Saou <http://freshrpms.net/> 1.6-1 +- Update to 1.6. +- Split "main" into "utils" (bin) and "devel" (the static lib). +- Add Makefile patch to ease install and get our CFLAGS used. +- Don't enable MMX on x86_64, the x86 asm fails. + +* Mon Aug 15 2005 Matthias Saou <http://freshrpms.net/> 1.5.4-5 +- Force __USE_LARGEFILE64 to fix FC4 ppc build. + +* Fri Apr 22 2005 Matthias Saou <http://freshrpms.net/> 1.5.4-4 +- Add gcc4 patch. + +* Thu Nov 4 2004 Matthias Saou <http://freshrpms.net/> 1.5.4-3 +- Remove unneeded /usr/bin fix, since we don't use "make install". +- Replace -O? with -O1 in optflags since build fails with O2 and gcc 3.4. +- Make nasm mandatory : The configure script won't run without it anyway. +- Use libdir/*.* in order to not catch all debuginfo files too. +- Added -devel provides for now. + +* Sat Jun 26 2004 Dag Wieers <dag(a)wieers.com> - 1.5.4-2 +- Fixes for x86_64. + +* Wed Apr 07 2004 Dag Wieers <dag(a)wieers.com> - 1.5.4-1 +- Updated to release 1.5.4. + +* Mon Sep 08 2003 Dag Wieers <dag(a)wieers.com> - 1.5.2-0 +- Updated to release 1.5.2. + +* Wed Feb 12 2003 Dag Wieers <dag(a)wieers.com> - 1.4-0 +- Initial package. (using DAR) --- NEW FILE libmpeg3.spec --- Summary: Decoder of various derivatives of MPEG standards Name: libmpeg3 Version: 1.7 Release: 6%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://heroinewarrior.com/libmpeg3.php3 Source: http://dl.sf.net/heroines/libmpeg3-%{version}-src.tar.bz2 Patch0: libmpeg3-1.7-makefile.patch Patch1: libmpeg3-1.7-cinelerra_autotools.patch Patch2: libmpeg3-1.7-cinelerra_hacking.patch Patch3: libmpeg3-1.7-fix_commented.patch Patch4: libmpeg3-1.7-spec_in.patch Patch5: libmpeg3-1.7-pkgconfig.in.patch Patch6: libmpeg3-1.7-boostrap.patch # Patches 7/8 from gentoo #http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libmpeg3/files/ Patch7: libmpeg3-1.5.2-gnustack.patch Patch8: libmpeg3-1.7-memcpy.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: nasm BuildRequires: a52dec-devel BuildRequires: libtool %description LibMPEG3 decodes the many many derivatives of MPEG standards into uncompressed data suitable for editing and playback. libmpeg3 currently decodes: - MPEG-1 Layer II/III Audio and program streams - MPEG-2 Layer III Audio, program streams and transport streams - MPEG-1 and MPEG-2 Video - AC3 Audio - IFO files - VOB files %package utils Summary: Utilities from libmpeg3 Group: Applications/Multimedia Requires: %{name} = %{version}-%{release} %description utils LibMPEG3 decodes the many many derivatives of MPEG standards into uncompressed data suitable for editing and playback. This package contains utility programs based on libmpeg3. %package devel Summary: Development files for libmpeg3 Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel LibMPEG3 decodes the many many derivatives of MPEG standards into uncompressed data suitable for editing and playback. This package contains files needed to build applications that will use libmpeg3. %prep %setup -q #patch0 -p1 -b .makefile # Removed unneeded files #rm -rf a52dec-* depend.a52 # Patch autotools %patch1 -p1 # Thoses patches was taken from cinepaint cvs # Which have special libmpeg3 #patch2 -p1 -b .cine_hack # Fix comments %patch3 -p1 -b .commented # Add spec.in %patch4 -p1 # Add pkgconfig.in %patch5 -p1 # Add ./bootstrap %patch6 -p1 # gentoo patches %patch7 -p1 -b .gnustack %patch8 -p1 -b .memcpy # Touch docs files: touch INSTALL README NEWS AUTHORS ChangeLog # Build autotools chmod 755 bootstrap ./bootstrap %build # Enable USE_MMX for archs that support it, not by default on i386 %configure --enable-shared --disable-static \ %ifarch i686 x86_64 # --enable-mmx \ %endif # This seems not to work with x86_64 on AMD64 # Error: suffix or operands invalid for `push' #sed -i -e 's|$(CCASFLAGS)|#$(CCASFLAGS)|g' video/Makefile make %{?_smp_mflags} %install %{__rm} -rf %{buildroot} %{__make} install \ LIBDIR=%{_libdir} \ DESTDIR=%{buildroot} \ INSTALL="install -c -p" %{__rm} -rf %{buildroot}%{_libdir}/*.la %clean %{__rm} -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-, root, root, -) %doc COPYING %{_libdir}/*.so.* %files utils %defattr(-, root, root, -) %{_bindir}/mpeg3cat %{_bindir}/mpeg3dump %{_bindir}/mpeg3peek %{_bindir}/mpeg3toc %files devel %doc docs/* %defattr(-, root, root,-) %{_libdir}/*.so %{_includedir}/mpeg3/ %{_libdir}/pkgconfig/%{name}.pc %changelog * Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.7-6 - rebuild * Fri Sep 28 2007 kwizart < kwizart at gmail.com > - 1.7-5 - Add gentoo patches 7: Remove executable stacks, thanks to Martin von Gagern in gentoo #131155. 8: Fix missing include string.h for implicit declaration of memcpy. * Thu Sep 13 2007 kwizart < kwizart at gmail.com > - 1.7-4 - Add autotools support (default is shared ) - Remove internal css - Build with our cflags (-fPIC is no more necessary ) - TODO build mpeg2qt * Fri Sep 7 2007 kwizart < kwizart at gmail.com > - 1.7-3 - Add dist tag - modified patch for Makefile - Add BR's * Wed Sep 20 2006 Matthias Saou <http://freshrpms.net/> 1.7-2 - Run make twice since there is an EOF error that makes the first run abort. * Mon Jul 3 2006 Matthias Saou <http://freshrpms.net/> 1.7-1 - Update to 1.7. * Fri Mar 17 2006 Matthias Saou <http://freshrpms.net/> 1.6-2 - Add -fPIC to the CFLAGS to fix transcode build on x86_64. * Thu Jan 19 2006 Matthias Saou <http://freshrpms.net/> 1.6-1 - Update to 1.6. - Split "main" into "utils" (bin) and "devel" (the static lib). - Add Makefile patch to ease install and get our CFLAGS used. - Don't enable MMX on x86_64, the x86 asm fails. * Mon Aug 15 2005 Matthias Saou <http://freshrpms.net/> 1.5.4-5 - Force __USE_LARGEFILE64 to fix FC4 ppc build. * Fri Apr 22 2005 Matthias Saou <http://freshrpms.net/> 1.5.4-4 - Add gcc4 patch. * Thu Nov 4 2004 Matthias Saou <http://freshrpms.net/> 1.5.4-3 - Remove unneeded /usr/bin fix, since we don't use "make install". - Replace -O? with -O1 in optflags since build fails with O2 and gcc 3.4. - Make nasm mandatory : The configure script won't run without it anyway. - Use libdir/*.* in order to not catch all debuginfo files too. - Added -devel provides for now. * Sat Jun 26 2004 Dag Wieers <dag(a)wieers.com> - 1.5.4-2 - Fixes for x86_64. * Wed Apr 07 2004 Dag Wieers <dag(a)wieers.com> - 1.5.4-1 - Updated to release 1.5.4. * Mon Sep 08 2003 Dag Wieers <dag(a)wieers.com> - 1.5.2-0 - Updated to release 1.5.2. * Wed Feb 12 2003 Dag Wieers <dag(a)wieers.com> - 1.4-0 - Initial package. (using DAR) Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/libmpeg3/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 16:53:00 -0000 1.1 +++ .cvsignore 4 Aug 2008 18:29:24 -0000 1.2 @@ -0,0 +1 @@ +libmpeg3-1.7-src.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/libmpeg3/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:53:00 -0000 1.1 +++ sources 4 Aug 2008 18:29:24 -0000 1.2 @@ -0,0 +1 @@ +4a3e8896164d59d7d0dff69b50b75352 libmpeg3-1.7-src.tar.bz2

16 years, 3 months

1
0
0 / 0

rpms/libmpeg3/F-9 libmpeg3-1.5.2-gnustack.patch, NONE, 1.1 libmpeg3-1.7-boostrap.patch, NONE, 1.1 libmpeg3-1.7-cinelerra_autotools.patch, NONE, 1.1 libmpeg3-1.7-cinelerra_hacking.patch, NONE, 1.1 libmpeg3-1.7-fix_commented.patch, NONE, 1.1 libmpeg3-1.7-makefile.patch, NONE, 1.1 libmpeg3-1.7-memcpy.patch, NONE, 1.1 libmpeg3-1.7-pkgconfig.in.patch, NONE, 1.1 libmpeg3-1.7-spec_in.patch, NONE, 1.1 libmpeg3.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

by Thorsten Leemhuis

Author: thl Update of /cvs/free/rpms/libmpeg3/F-9 In directory se02.es.rpmfusion.net:/tmp/cvs-serv18905 Modified Files: .cvsignore sources Added Files: libmpeg3-1.5.2-gnustack.patch libmpeg3-1.7-boostrap.patch libmpeg3-1.7-cinelerra_autotools.patch libmpeg3-1.7-cinelerra_hacking.patch libmpeg3-1.7-fix_commented.patch libmpeg3-1.7-makefile.patch libmpeg3-1.7-memcpy.patch libmpeg3-1.7-pkgconfig.in.patch libmpeg3-1.7-spec_in.patch libmpeg3.spec Log Message: initial import from livna libmpeg3-1.5.2-gnustack.patch: --- NEW FILE libmpeg3-1.5.2-gnustack.patch --- diff -ru libmpeg3-1.5.2.orig/video/mmxidct.S libmpeg3-1.5.2/video/mmxidct.S --- libmpeg3-1.5.2.orig/video/mmxidct.S 2006-04-24 23:13:14.000000000 +0200 +++ libmpeg3-1.5.2/video/mmxidct.S 2006-04-24 23:13:47.000000000 +0200 @@ -673,3 +673,7 @@ ret .Lfe1: .size IDCT_mmx,.Lfe1-IDCT_mmx + +#ifdef __ELF__ +.section .note.GNU-stack,"",%progbits +#endif diff -ru libmpeg3-1.5.2.orig/video/reconmmx.s libmpeg3-1.5.2/video/reconmmx.s --- libmpeg3-1.5.2.orig/video/reconmmx.s 2006-04-24 23:13:14.000000000 +0200 +++ libmpeg3-1.5.2/video/reconmmx.s 2006-04-24 23:13:20.000000000 +0200 @@ -298,4 +298,6 @@ pop esi ret - +%ifidn __OUTPUT_FORMAT__,elf +section .note.GNU-stack noalloc noexec nowrite progbits +%endif libmpeg3-1.7-boostrap.patch: --- NEW FILE libmpeg3-1.7-boostrap.patch --- diff -uNr libmpeg3-1.7-bootstrap/bootstrap libmpeg3-1.7/bootstrap --- libmpeg3-1.7-bootstrap/bootstrap 1970-01-01 01:00:00.000000000 +0100 +++ libmpeg3-1.7/bootstrap 2007-09-14 00:27:39.000000000 +0200 @@ -0,0 +1,7 @@ +#!/bin/sh +set -x +aclocal +libtoolize --force --copy +autoheader +automake --add-missing --copy +autoconf libmpeg3-1.7-cinelerra_autotools.patch: --- NEW FILE libmpeg3-1.7-cinelerra_autotools.patch --- diff -uNr libmpeg3-1.7/audio/ac3.c libmpeg3-cinelerra/audio/ac3.c --- libmpeg3-1.7/audio/ac3.c 2006-01-11 05:42:23.000000000 +0100 +++ libmpeg3-cinelerra/audio/ac3.c 2007-07-05 00:42:40.000000000 +0200 @@ -1,7 +1,7 @@ #include <stdint.h> #include <stdio.h> -#include "a52.h" +#include <a52dec/a52.h> #include "mpeg3private.h" #include "mpeg3protos.h" diff -uNr libmpeg3-1.7/audio/Makefile.am libmpeg3-cinelerra/audio/Makefile.am --- libmpeg3-1.7/audio/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ libmpeg3-cinelerra/audio/Makefile.am 2007-07-05 00:42:40.000000000 +0200 @@ -0,0 +1,12 @@ +noinst_LTLIBRARIES = libmpeg3_audio.la +libmpeg3_audio_la_SOURCES = ac3.c dct.c huffman.c layer2.c layer3.c mpeg3audio.c pcm.c synthesizers.c tables.c +libmpeg3_audio_la_LDFLAGS = + +noinst_HEADERS = ac3.h huffman.h mpeg3audio.h tables.h + +AM_CFLAGS = $(CPU_CFLAGS) $(LARGEFILE_CFLAGS) +AM_CXXFLAGS = $(CPU_CFLAGS) $(LARGEFILE_CFLAGS) +INCLUDES=-I$(srcdir)/.. + +LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTC_FLAGS) + diff -uNr libmpeg3-1.7/configure.in libmpeg3-cinelerra/configure.in --- libmpeg3-1.7/configure.in 1970-01-01 01:00:00.000000000 +0100 +++ libmpeg3-cinelerra/configure.in 2007-09-08 23:27:17.000000000 +0200 @@ -0,0 +1,83 @@ +# Process this file with autoconf to produce a configure script. +AC_INIT(libmpeg3, 1.7) +AM_INIT_AUTOMAKE([dist-bzip2]) +AC_PREREQ(2.53) +AM_CONFIG_HEADER([config.h]) +AM_PROG_AS +AC_DISABLE_SHARED +AC_ENABLE_STATIC +AC_PROG_LIBTOOL + +LIBMPEG3_VERSION_CURRENT=1 +LIBMPEG3_VERSION_REVISION=0 +LIBMPEG3_VERSION_AGE=0 +LIBMPEG3_VERSION_INFO=$LIBMPEG3_VERSION_CURRENT:$LIBMPEG3_VERSION_REVISION:$LIBMPEG3_VERSION_AGE +AC_SUBST(LIBMPEG3_VERSION_INFO) + +# Checks for programs. +AC_PROG_CC + +# hack for using nasm for .S files +CCAS="nasm --tag=$CC" +AC_SUBST(CCAS) +AC_SUBST(CCASFLAGS) + +############## MMX + +AC_ARG_ENABLE(mmx, + AC_HELP_STRING([--enable-mmx], [enables support for mmx (default is autodetect)]), + [ enable_mmx=$enableval ],[ enable_mmx=auto ]) +case "$target_cpu" in +i586 | i686) + test "x$enable_mmx" = "xauto" && enable_mmx=yes + + CPU_CFLAGS="-DX86_CPU $CPU_CFLAGS" + + if test "x$enable_mmx" = "xyes"; then + CPU_CFLAGS="-DHAVE_MMX -DUSE_MMX $CPU_CFLAGS" # -D_MMX_ doesn't work + enable_mmx32=yes + fi +;; +x86_64) + test "x$enable_mmx" = "xauto" && enable_mmx=yes + CPU_CFLAGS="-DX86_CPU $CPU_CFLAGS" + if test "x$enable_mmx" = "xyes"; then + CPU_CFLAGS="-DHAVE_MMX -DUSE_MMX $CPU_CFLAGS" + + fi +;; +esac + +test "x$enable_mmx" = "xauto" && enable_mmx=no + +AM_CONDITIONAL(USEMMX, test "x$enable_mmx" = "xyes") +AM_CONDITIONAL(USEMMX32, test "x$enable_mmx32" = "xyes") +AM_CONDITIONAL(TARGET_BUILTIN_VECTOR,test "x$enable_mmx" = "xyes") +AC_SUBST(LIBDECORE_LIBADD) +AC_SUBST(CPU_CFLAGS) + +############## END OF MMX + +LARGEFILE_CFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" +AC_SUBST(LARGEFILE_CFLAGS) + +# Checks for header files. +AC_HEADER_STDC +AC_CHECK_HEADERS([stdlib.h string.h]) + +# Checks for typedefs, structures, and compiler characteristics. +AC_C_CONST +AC_C_INLINE +AC_STRUCT_TM + +# Checks for libraries. + +AC_CONFIG_FILES([ +Makefile +audio/Makefile +video/Makefile +libmpeg3.spec +libmpeg3.pc +]) +AC_OUTPUT + diff -uNr libmpeg3-1.7/Makefile.am libmpeg3-cinelerra/Makefile.am --- libmpeg3-1.7/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ libmpeg3-cinelerra/Makefile.am 2007-09-08 22:58:17.000000000 +0200 @@ -0,0 +1,61 @@ +lib_LTLIBRARIES = libmpeg3.la +AM_CFLAGS = $(CPU_CFLAGS) $(LARGEFILE_CFLAGS) +libmpeg3_la_LDFLAGS = -version-info @LIBMPEG3_VERSION_INFO@ +libmpeg3_la_LIBADD = -la52 video/libmpeg3_video.la audio/libmpeg3_audio.la -lm \ + -lpthread +libmpeg3_la_SOURCES = libmpeg3.c mpeg3bits.c mpeg3atrack.c mpeg3css.c \ + mpeg3demux.c \ + mpeg3ifo.c \ + mpeg3io.c \ + mpeg3strack.c \ + mpeg3title.c \ + mpeg3tocutil.c \ + mpeg3vtrack.c \ + workarounds.c + +bin_PROGRAMS = mpeg3dump mpeg3peek mpeg3toc mpeg3cat # mpeg2qt +mpeg3dump_SOURCES = mpeg3dump.c +mpeg3dump_LDADD = libmpeg3.la +mpeg3dump_CFLAGS = $(AM_CFLAGS) +mpeg3peek_SOURCES = mpeg3peek.c +mpeg3peek_LDADD = libmpeg3.la +mpeg3peek_CFLAGS = $(AM_CFLAGS) +mpeg3toc_SOURCES = mpeg3toc.c +mpeg3toc_LDADD = libmpeg3.la +mpeg3toc_CFLAGS = $(AM_CFLAGS) +mpeg3cat_SOURCES = mpeg3cat.c +mpeg3cat_LDADD = libmpeg3.la +mpeg3cat_CFLAGS = $(AM_CFLAGS) +#mpeg2qt_SOURCES = mpeg2qt.c # disabled to prevent circle dependencies +#mpeg2qt_LDADD = libmpeg3.la -lpng -lz -ldl -lquicktime4linux +#mpeg2qt_CFLAGS = $(AM_CFLAGS) -I$(includedir)/quicktime4linux + +SUBDIRS = audio video + +EXTRA_DIST = docs + +noinst_HEADERS = bitstream.h \ + ifo.h \ + libmpeg3.h \ + mpeg3atrack.h \ + mpeg3css.h \ + mpeg3css_fake.c \ + mpeg3demux.h \ + mpeg3io.h \ + mpeg3private.h \ + mpeg3private.inc \ + mpeg3protos.h \ + mpeg3title.h \ + mpeg3vtrack.h \ + timecode.h \ + workarounds.h + +dist_noinst_SCRIPTS = bootstrap + +pkgincludedir=$(includedir)/mpeg3 +pkginclude_HEADERS=libmpeg3.h mpeg3private.h + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = libmpeg3.pc + +LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTC_FLAGS) diff -uNr libmpeg3-1.7/video/Makefile.am libmpeg3-cinelerra/video/Makefile.am --- libmpeg3-1.7/video/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ libmpeg3-cinelerra/video/Makefile.am 2007-07-05 00:42:40.000000000 +0200 @@ -0,0 +1,29 @@ +noinst_LTLIBRARIES = libmpeg3_video.la +libmpeg3_video_la_SOURCES = getpicture.c headers.c idct.c macroblocks.c mmxtest.c motion.c \ + mpeg3cache.c \ + mpeg3video.c \ + output.c \ + reconstruct.c \ + seek.c \ + slice.c \ + subtitle.c \ + vlc.c + +if USEMMX +libmpeg3_video_la_SOURCES += mmxidct.S reconmmx.s +else +libmpeg3_video_la_SOURCES += +endif + +noinst_HEADERS = idct.h \ + layerdata.h \ + mpeg3video.h \ + mpeg3videoprotos.h \ + slice.h \ + vlc.h + +libmpeg3_video_la_LDFLAGS= +AM_CFLAGS = $(CPU_CFLAGS) $(LARGEFILE_CFLAGS) +INCLUDES=-I$(srcdir)/.. + +LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTC_FLAGS) libmpeg3-1.7-cinelerra_hacking.patch: --- NEW FILE libmpeg3-1.7-cinelerra_hacking.patch --- diff -uNr libmpeg3-1.7/libmpeg3.c libmpeg3-cinelerra/libmpeg3.c --- libmpeg3-1.7/libmpeg3.c 2006-03-29 06:14:26.000000000 +0200 +++ libmpeg3-cinelerra/libmpeg3.c 2007-07-05 00:42:40.000000000 +0200 @@ -181,6 +181,7 @@ strncasecmp(ext, ".mpg", 4) && strncasecmp(ext, ".vob", 4) && strncasecmp(ext, ".mpeg", 4) && + strncasecmp(ext, ".m2t", 4) && strncasecmp(ext, ".ac3", 4)) result = 0; } diff -uNr libmpeg3-1.7/libmpeg3.h libmpeg3-cinelerra/libmpeg3.h --- libmpeg3-1.7/libmpeg3.h 2006-03-29 06:14:26.000000000 +0200 +++ libmpeg3-cinelerra/libmpeg3.h 2007-07-05 00:42:40.000000000 +0200 @@ -5,6 +5,7 @@ extern "C" { #endif +// FIXME: don't include private definitions in external header #include "mpeg3private.h" diff -uNr libmpeg3-1.7/mpeg3toc.c libmpeg3-cinelerra/mpeg3toc.c --- libmpeg3-1.7/mpeg3toc.c 2005-12-23 23:54:55.000000000 +0100 +++ libmpeg3-cinelerra/mpeg3toc.c 2007-07-05 00:42:40.000000000 +0200 @@ -574,7 +574,7 @@ if(j == vtracks - 1 && l == frame_count - 1) { total_frames += frame_count; - fprintf(stderr, "Video: title=%lld total_frames=%d ", title_number, total_frames); + fprintf(stderr, "Video: title=%lld total_frames=%d (%.1f \%)", title_number, total_frames,100*((float)position)/((float) mpeg3demux_movie_size(demuxer))); } } } diff -uNr libmpeg3-1.7/video/output.c libmpeg3-cinelerra/video/output.c --- libmpeg3-1.7/video/output.c 2006-01-07 10:55:56.000000000 +0100 +++ libmpeg3-cinelerra/video/output.c 2007-07-05 00:42:40.000000000 +0200 @@ -104,7 +104,7 @@ *data++ = 0; #define STORE_PIXEL_RGB565 \ - *((unsigned short*)data) = \ + *(*(unsigned short**)(&data))++ = \ ((CLIP(r_l) & 0xf8) << 8) | \ ((CLIP(g_l) & 0xfc) << 3) | \ ((CLIP(b_l) & 0xf8) >> 3); \ diff -uNr libmpeg3-1.7/video/vlc.c libmpeg3-cinelerra/video/vlc.c --- libmpeg3-1.7/video/vlc.c 2005-04-21 05:59:42.000000000 +0200 +++ libmpeg3-cinelerra/video/vlc.c 2007-07-05 00:42:40.000000000 +0200 @@ -1,3 +1,6 @@ +// FIXME: vlc.h redefines ERROR to 99 if and only if error is defined. +#define ERROR + #include "mpeg3private.h" #include "mpeg3protos.h" #include "vlc.h" libmpeg3-1.7-fix_commented.patch: --- NEW FILE libmpeg3-1.7-fix_commented.patch --- diff -up libmpeg3-1.7/mpeg3protos.h.commented libmpeg3-1.7/mpeg3protos.h --- libmpeg3-1.7/mpeg3protos.h.commented 2006-03-29 06:14:26.000000000 +0200 +++ libmpeg3-1.7/mpeg3protos.h 2007-09-11 18:20:08.000000000 +0200 @@ -390,7 +390,7 @@ int mpeg3demux_open_title(mpeg3_demuxer_ /* Go to the absolute byte given */ int mpeg3demux_seek_byte(mpeg3_demuxer_t *demuxer, int64_t byte); -/* Seek to the title and cell containing the absolute byte of the +/* Seek to the title and cell containing the absolute byte of the */ /* demuxer. */ /* Called at the beginning of every packet. */ int mpeg3_seek_phys(mpeg3_demuxer_t *demuxer); libmpeg3-1.7-makefile.patch: --- NEW FILE libmpeg3-1.7-makefile.patch --- diff -up libmpeg3-1.7/Makefile.makefile libmpeg3-1.7/Makefile --- libmpeg3-1.7/Makefile.makefile 2006-02-15 06:09:31.000000000 +0100 +++ libmpeg3-1.7/Makefile 2007-09-08 03:16:05.000000000 +0200 @@ -9,6 +9,10 @@ ifeq ("$(PREFIX)", "") PREFIX=/usr endif +ifeq ("$(LIBDIR)", "") +LIBDIR=$(PREFIX)/lib +endif + ifeq ($(origin CFLAGS), environment) HAVE_CFLAGS := y else @@ -16,36 +20,13 @@ HAVE_CFLAGS := n endif +ifeq ("$(OBJDIR)", "") OBJDIR := $(shell uname --machine) - - - - -ifeq ($(OBJDIR), alpha) - USE_MMX = 0 - ifneq ($(HAVE_CFLAGS), y) - CFLAGS := -O4 -arch ev67 -ieee -accept c99_keywords -gcc_messages - endif -endif - -ifeq ($(OBJDIR), i686) - USE_MMX = 1 - ifneq ($(HAVE_CFLAGS), y) - CFLAGS := -O2 -fomit-frame-pointer -falign-loops=2 -falign-jumps=2 -falign-functions=2 -I/usr/local/include - endif - CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -endif - -ifeq ($(OBJDIR), x86_64) - ifneq ($(HAVE_CFLAGS), y) - CFLAGS := -O2 -fomit-frame-pointer -I/usr/local/include - endif - CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE - - endif +CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE + ifeq ($(USE_CSS), 1) CFLAGS += -DHAVE_CSS @@ -64,8 +45,7 @@ endif CFLAGS += \ -I. \ - -I$(A52DIR)/include \ - -I$(A52DIR)/liba52 + -I/usr/include/a52dec @@ -136,9 +116,9 @@ DIRS := \ $(OBJDIR)/audio \ $(OBJDIR)/video -include Makefile.a52 +#include Makefile.a52 -DIRS += $(A52DIRS) +#DIRS += $(A52DIRS) OUTPUT = $(OBJDIR)/libmpeg3.a @@ -147,40 +127,40 @@ UTILS = $(OBJDIR)/mpeg3dump $(OBJDIR)/mp #$(OBJDIR)/mpeg3split -LIBS = -lm -lpthread +LIBS = -lm -lpthread -la52 $(shell if ! test -d $(OBJDIR) \; then mkdir -p $(OBJDIR) \; fi ) -$(shell echo $(CFLAGS) > $(OBJDIR)/c_flags) -$(shell echo $(A52CFLAGS) > $(OBJDIR)/a52_flags) -$(shell echo $(OBJS) $(ASMOBJS) $(A52OBJS) $(NASMOBJS) > $(OBJDIR)/objs) +#(shell echo $(CFLAGS) > $(OBJDIR)/c_flags) +#$(shell echo $(A52CFLAGS) > $(OBJDIR)/a52_flags) +#$(shell echo $(OBJS) $(ASMOBJS) $(NASMOBJS) > $(OBJDIR)/objs) $(shell mkdir -p $(DIRS) ) all: $(OUTPUT) $(UTILS) -$(OUTPUT): $(OBJS) $(ASMOBJS) $(NASMOBJS) $(A52OBJS) - ar rcs $(OUTPUT) `cat $(OBJDIR)/objs` +$(OUTPUT): $(OBJS) $(ASMOBJS) $(NASMOBJS) + ar rcs $(OUTPUT) $(OBJS) $(ASMOBJS) $(NASMOBJS) $(OBJDIR)/mpeg3dump: $(OUTPUT) mpeg3dump.c - $(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3dump mpeg3dump.c $(OUTPUT) $(LIBS) + $(CC) $(CFLAGS) -o $(OBJDIR)/mpeg3dump mpeg3dump.c $(OUTPUT) $(LIBS) $(OBJDIR)/mpeg3peek: $(OUTPUT) mpeg3peek.c - $(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3peek mpeg3peek.c $(OUTPUT) $(LIBS) + $(CC) $(CFLAGS) -o $(OBJDIR)/mpeg3peek mpeg3peek.c $(OUTPUT) $(LIBS) $(OBJDIR)/mpeg3toc: $(OUTPUT) mpeg3toc.c - $(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3toc mpeg3toc.c $(OUTPUT) $(LIBS) + $(CC) $(CFLAGS) -o $(OBJDIR)/mpeg3toc mpeg3toc.c $(OUTPUT) $(LIBS) $(OBJDIR)/mpeg3cat: $(OUTPUT) mpeg3cat.c - $(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3cat mpeg3cat.c $(OUTPUT) $(LIBS) + $(CC) $(CFLAGS) -o $(OBJDIR)/mpeg3cat mpeg3cat.c $(OUTPUT) $(LIBS) #$(OBJDIR)/mpeg3split: $(OUTPUT) -# $(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3split mpeg3split.c $(OUTPUT) $(LIBS) +# $(CC) $(CFLAGS) -o $(OBJDIR)/mpeg3split mpeg3split.c $(OUTPUT) $(LIBS) $(OBJDIR)/mpeg2qt: $(OUTPUT) - $(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg2qt mpeg2qt.c \ + $(CC) $(CFLAGS) -o $(OBJDIR)/mpeg2qt mpeg2qt.c \ $(OUTPUT) \ $(LIBS) \ -I. \ @@ -191,9 +171,12 @@ $(OBJDIR)/mpeg2qt: $(OUTPUT) -ldl install: - cp $(UTILS) $(PREFIX)/bin -# cp $(OUTPUT) $(PREFIX)/lib -# cp libmpeg3.h mpeg3private.h $(PREFIX)/include + mkdir -p $(DESTDIR)$(PREFIX)/bin + cp $(UTILS) $(DESTDIR)$(PREFIX)/bin + mkdir -p $(DESTDIR)$(LIBDIR) + cp $(OUTPUT) $(DESTDIR)$(LIBDIR) + mkdir -p $(DESTDIR)$(PREFIX)/include + cp libmpeg3.h mpeg3private.h $(DESTDIR)$(PREFIX)/include clean: rm -rf $(OBJDIR) @@ -206,13 +189,13 @@ wc: cat *.c *.h audio/*.c audio/*.h video/*.c video/*.h | wc $(OBJS): - $(CC) -c `cat $(OBJDIR)/c_flags` $(subst $(OBJDIR)/,, $*.c) -o $*.o + $(CC) -c $(CFLAGS) $(subst $(OBJDIR)/,, $*.c) -o $*.o $(ASMOBJS): - $(CC) -c `cat $(OBJDIR)/c_flags` $(subst $(OBJDIR)/,, $*.S) -o $*.o + $(CC) -c $(CFLAGS) $(subst $(OBJDIR)/,, $*.S) -o $*.o $(NASMOBJS): $(NASM) -f elf $(subst $(OBJDIR)/,, $*.s) -o $*.o -$(A52OBJS): - $(CC) -c `cat $(OBJDIR)/a52_flags` $(subst $(OBJDIR)/,, $*.c) -o $*.o +#(A52OBJS): +# $(CC) -c $(CFLAGS) $(subst $(OBJDIR)/,, $*.c) -o $*.o $(OBJDIR)/libmpeg3.o: libmpeg3.c $(OBJDIR)/mpeg3atrack.o: mpeg3atrack.c libmpeg3-1.7-memcpy.patch: --- NEW FILE libmpeg3-1.7-memcpy.patch --- diff -ur libmpeg3-1.7.orig/audio/mpeg3audio.c libmpeg3-1.7/audio/mpeg3audio.c --- libmpeg3-1.7.orig/audio/mpeg3audio.c 2006-02-19 13:43:27.000000000 +0200 +++ libmpeg3-1.7/audio/mpeg3audio.c 2007-08-17 18:06:37.000000000 +0300 @@ -3,7 +3,7 @@ #include <math.h> #include <stdlib.h> - +#include <string.h> diff -ur libmpeg3-1.7.orig/video/subtitle.c libmpeg3-1.7/video/subtitle.c --- libmpeg3-1.7.orig/video/subtitle.c 2006-02-27 06:14:00.000000000 +0200 +++ libmpeg3-1.7/video/subtitle.c 2007-08-17 18:07:00.000000000 +0300 @@ -2,6 +2,7 @@ #include "mpeg3protos.h" #include <stdlib.h> +#include <string.h> static unsigned char get_nibble(unsigned char **ptr, int *nibble) { libmpeg3-1.7-pkgconfig.in.patch: --- NEW FILE libmpeg3-1.7-pkgconfig.in.patch --- diff -uNr libmpeg3-1.7_spec/libmpeg3.pc.in libmpeg3-1.7/libmpeg3.pc.in --- libmpeg3-1.7_spec/libmpeg3.pc.in 1970-01-01 01:00:00.000000000 +0100 +++ libmpeg3-1.7/libmpeg3.pc.in 2007-09-11 22:08:28.000000000 +0200 @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@prefix@ +libdir=@libdir@ +includedir=@includedir@/mpeg3 + +Name: @PACKAGE@ +Description: Decoder of various derivatives of MPEG standards +Version: @VERSION@ +Requires: +Conflicts: +Libs: -L${libdir} -lmpeg3 -lpthread -la52 +Cflags: -I${includedir} libmpeg3-1.7-spec_in.patch: --- NEW FILE libmpeg3-1.7-spec_in.patch --- diff -uNr libmpeg3-1.7_spec/libmpeg3.spec.in libmpeg3-1.7/libmpeg3.spec.in --- libmpeg3-1.7_spec/libmpeg3.spec.in 1970-01-01 01:00:00.000000000 +0100 +++ libmpeg3-1.7/libmpeg3.spec.in 2007-09-11 21:34:13.000000000 +0200 @@ -0,0 +1,160 @@ +Summary: Decoder of various derivatives of MPEG standards +Name: libmpeg3 +Version: @VERSION@ +Release: 1%{?dist} +License: GPLv2+ +Group: System Environment/Libraries +URL: http://heroinewarrior.com/libmpeg3.php3 +Source: http://dl.sf.net/heroines/libmpeg3-%{version}-src.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +#BuildRequires: nasm +#BuildRequires: a52dec-devel + +#BuildRequires: autoconf, libtool, automake + +%description +LibMPEG3 decodes the many many derivatives of MPEG standards into +uncompressed data suitable for editing and playback. + +libmpeg3 currently decodes: + - MPEG-1 Layer II/III Audio and program streams + - MPEG-2 Layer III Audio, program streams and transport streams + - MPEG-1 and MPEG-2 Video + - AC3 Audio + - IFO files + - VOB files + + +%package utils +Summary: Utilities from libmpeg3 +Group: Applications/Multimedia +Requires: %{name} = %{version}-%{release} + +%description utils +LibMPEG3 decodes the many many derivatives of MPEG standards into +uncompressed data suitable for editing and playback. + +This package contains utility programs based on libmpeg3. + + +%package devel +Summary: Development files for libmpeg3 +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +LibMPEG3 decodes the many many derivatives of MPEG standards into +uncompressed data suitable for editing and playback. + +This package contains files needed to build applications that will use +libmpeg3. + + +%prep +%setup -q + + + + +%build +%configure --enable-shared --enable-static +%ifarch i686 x86_64 +# --enable-mmx \ +%endif + +make %{?_smp_mflags} + + + +%install +%{__rm} -rf %{buildroot} + +%{__make} install \ + LIBDIR=%{_libdir} \ + DESTDIR=%{buildroot} \ + INSTALL="install -c -p" + +%{__rm} -rf %{buildroot}%{_libdir}/*.la + + +%clean +%{__rm} -rf %{buildroot} + + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + + +%files +%defattr(-, root, root, -) +%doc COPYING +%{_libdir}/*.so.* + +%files utils +%defattr(-, root, root, -) +%{_bindir}/mpeg3cat +%{_bindir}/mpeg3dump +%{_bindir}/mpeg3peek +%{_bindir}/mpeg3toc +#{_bindir}/mpeg2qt + +%files devel +%defattr(-, root, root,-) +%doc docs/* +%{_libdir}/*.so +%{_libdir}/*.a +%{_includedir}/mpeg3/ +%{_libdir}/pkgconfig/*.pc + + +%changelog +* Sun Sep 9 2007 kwizart < kwizart at gmail.com > - 1.7-4 +- Add autotools support (default is still static ) +- Remove internal css +- Build with our cflags (-fPIC is no more necessary ) + +* Fri Sep 7 2007 kwizart < kwizart at gmail.com > - 1.7-3 +- Add dist tag +- modified patch for Makefile +- Add BR's + +* Wed Sep 20 2006 Matthias Saou <http://freshrpms.net/> 1.7-2 +- Run make twice since there is an EOF error that makes the first run abort. + +* Mon Jul 3 2006 Matthias Saou <http://freshrpms.net/> 1.7-1 +- Update to 1.7. + +* Fri Mar 17 2006 Matthias Saou <http://freshrpms.net/> 1.6-2 +- Add -fPIC to the CFLAGS to fix transcode build on x86_64. + +* Thu Jan 19 2006 Matthias Saou <http://freshrpms.net/> 1.6-1 +- Update to 1.6. +- Split "main" into "utils" (bin) and "devel" (the static lib). +- Add Makefile patch to ease install and get our CFLAGS used. +- Don't enable MMX on x86_64, the x86 asm fails. + +* Mon Aug 15 2005 Matthias Saou <http://freshrpms.net/> 1.5.4-5 +- Force __USE_LARGEFILE64 to fix FC4 ppc build. + +* Fri Apr 22 2005 Matthias Saou <http://freshrpms.net/> 1.5.4-4 +- Add gcc4 patch. + +* Thu Nov 4 2004 Matthias Saou <http://freshrpms.net/> 1.5.4-3 +- Remove unneeded /usr/bin fix, since we don't use "make install". +- Replace -O? with -O1 in optflags since build fails with O2 and gcc 3.4. +- Make nasm mandatory : The configure script won't run without it anyway. +- Use libdir/*.* in order to not catch all debuginfo files too. +- Added -devel provides for now. + +* Sat Jun 26 2004 Dag Wieers <dag(a)wieers.com> - 1.5.4-2 +- Fixes for x86_64. + +* Wed Apr 07 2004 Dag Wieers <dag(a)wieers.com> - 1.5.4-1 +- Updated to release 1.5.4. + +* Mon Sep 08 2003 Dag Wieers <dag(a)wieers.com> - 1.5.2-0 +- Updated to release 1.5.2. + +* Wed Feb 12 2003 Dag Wieers <dag(a)wieers.com> - 1.4-0 +- Initial package. (using DAR) --- NEW FILE libmpeg3.spec --- Summary: Decoder of various derivatives of MPEG standards Name: libmpeg3 Version: 1.7 Release: 6%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://heroinewarrior.com/libmpeg3.php3 Source: http://dl.sf.net/heroines/libmpeg3-%{version}-src.tar.bz2 Patch0: libmpeg3-1.7-makefile.patch Patch1: libmpeg3-1.7-cinelerra_autotools.patch Patch2: libmpeg3-1.7-cinelerra_hacking.patch Patch3: libmpeg3-1.7-fix_commented.patch Patch4: libmpeg3-1.7-spec_in.patch Patch5: libmpeg3-1.7-pkgconfig.in.patch Patch6: libmpeg3-1.7-boostrap.patch # Patches 7/8 from gentoo #http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libmpeg3/files/ Patch7: libmpeg3-1.5.2-gnustack.patch Patch8: libmpeg3-1.7-memcpy.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: nasm BuildRequires: a52dec-devel BuildRequires: libtool %description LibMPEG3 decodes the many many derivatives of MPEG standards into uncompressed data suitable for editing and playback. libmpeg3 currently decodes: - MPEG-1 Layer II/III Audio and program streams - MPEG-2 Layer III Audio, program streams and transport streams - MPEG-1 and MPEG-2 Video - AC3 Audio - IFO files - VOB files %package utils Summary: Utilities from libmpeg3 Group: Applications/Multimedia Requires: %{name} = %{version}-%{release} %description utils LibMPEG3 decodes the many many derivatives of MPEG standards into uncompressed data suitable for editing and playback. This package contains utility programs based on libmpeg3. %package devel Summary: Development files for libmpeg3 Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel LibMPEG3 decodes the many many derivatives of MPEG standards into uncompressed data suitable for editing and playback. This package contains files needed to build applications that will use libmpeg3. %prep %setup -q #patch0 -p1 -b .makefile # Removed unneeded files #rm -rf a52dec-* depend.a52 # Patch autotools %patch1 -p1 # Thoses patches was taken from cinepaint cvs # Which have special libmpeg3 #patch2 -p1 -b .cine_hack # Fix comments %patch3 -p1 -b .commented # Add spec.in %patch4 -p1 # Add pkgconfig.in %patch5 -p1 # Add ./bootstrap %patch6 -p1 # gentoo patches %patch7 -p1 -b .gnustack %patch8 -p1 -b .memcpy # Touch docs files: touch INSTALL README NEWS AUTHORS ChangeLog # Build autotools chmod 755 bootstrap ./bootstrap %build # Enable USE_MMX for archs that support it, not by default on i386 %configure --enable-shared --disable-static \ %ifarch i686 x86_64 # --enable-mmx \ %endif # This seems not to work with x86_64 on AMD64 # Error: suffix or operands invalid for `push' #sed -i -e 's|$(CCASFLAGS)|#$(CCASFLAGS)|g' video/Makefile make %{?_smp_mflags} %install %{__rm} -rf %{buildroot} %{__make} install \ LIBDIR=%{_libdir} \ DESTDIR=%{buildroot} \ INSTALL="install -c -p" %{__rm} -rf %{buildroot}%{_libdir}/*.la %clean %{__rm} -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-, root, root, -) %doc COPYING %{_libdir}/*.so.* %files utils %defattr(-, root, root, -) %{_bindir}/mpeg3cat %{_bindir}/mpeg3dump %{_bindir}/mpeg3peek %{_bindir}/mpeg3toc %files devel %doc docs/* %defattr(-, root, root,-) %{_libdir}/*.so %{_includedir}/mpeg3/ %{_libdir}/pkgconfig/%{name}.pc %changelog * Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.7-6 - rebuild * Fri Sep 28 2007 kwizart < kwizart at gmail.com > - 1.7-5 - Add gentoo patches 7: Remove executable stacks, thanks to Martin von Gagern in gentoo #131155. 8: Fix missing include string.h for implicit declaration of memcpy. * Thu Sep 13 2007 kwizart < kwizart at gmail.com > - 1.7-4 - Add autotools support (default is shared ) - Remove internal css - Build with our cflags (-fPIC is no more necessary ) - TODO build mpeg2qt * Fri Sep 7 2007 kwizart < kwizart at gmail.com > - 1.7-3 - Add dist tag - modified patch for Makefile - Add BR's * Wed Sep 20 2006 Matthias Saou <http://freshrpms.net/> 1.7-2 - Run make twice since there is an EOF error that makes the first run abort. * Mon Jul 3 2006 Matthias Saou <http://freshrpms.net/> 1.7-1 - Update to 1.7. * Fri Mar 17 2006 Matthias Saou <http://freshrpms.net/> 1.6-2 - Add -fPIC to the CFLAGS to fix transcode build on x86_64. * Thu Jan 19 2006 Matthias Saou <http://freshrpms.net/> 1.6-1 - Update to 1.6. - Split "main" into "utils" (bin) and "devel" (the static lib). - Add Makefile patch to ease install and get our CFLAGS used. - Don't enable MMX on x86_64, the x86 asm fails. * Mon Aug 15 2005 Matthias Saou <http://freshrpms.net/> 1.5.4-5 - Force __USE_LARGEFILE64 to fix FC4 ppc build. * Fri Apr 22 2005 Matthias Saou <http://freshrpms.net/> 1.5.4-4 - Add gcc4 patch. * Thu Nov 4 2004 Matthias Saou <http://freshrpms.net/> 1.5.4-3 - Remove unneeded /usr/bin fix, since we don't use "make install". - Replace -O? with -O1 in optflags since build fails with O2 and gcc 3.4. - Make nasm mandatory : The configure script won't run without it anyway. - Use libdir/*.* in order to not catch all debuginfo files too. - Added -devel provides for now. * Sat Jun 26 2004 Dag Wieers <dag(a)wieers.com> - 1.5.4-2 - Fixes for x86_64. * Wed Apr 07 2004 Dag Wieers <dag(a)wieers.com> - 1.5.4-1 - Updated to release 1.5.4. * Mon Sep 08 2003 Dag Wieers <dag(a)wieers.com> - 1.5.2-0 - Updated to release 1.5.2. * Wed Feb 12 2003 Dag Wieers <dag(a)wieers.com> - 1.4-0 - Initial package. (using DAR) Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/libmpeg3/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 16:53:00 -0000 1.1 +++ .cvsignore 4 Aug 2008 18:29:06 -0000 1.2 @@ -0,0 +1 @@ +libmpeg3-1.7-src.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/libmpeg3/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:53:00 -0000 1.1 +++ sources 4 Aug 2008 18:29:06 -0000 1.2 @@ -0,0 +1 @@ +4a3e8896164d59d7d0dff69b50b75352 libmpeg3-1.7-src.tar.bz2

16 years, 3 months

1
0
0 / 0

rpms/mpgtx/F-8 mpgtx-1.3.1-makefile.patch, NONE, 1.1 mpgtx.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

by Thorsten Leemhuis

Author: thl Update of /cvs/free/rpms/mpgtx/F-8 In directory se02.es.rpmfusion.net:/tmp/cvs-serv18781 Modified Files: .cvsignore sources Added Files: mpgtx-1.3.1-makefile.patch mpgtx.spec Log Message: initial import from livna mpgtx-1.3.1-makefile.patch: --- NEW FILE mpgtx-1.3.1-makefile.patch --- --- /home/mlj/rpm/BUILD/mpgtx-1.3.1/configure.orig 2005-01-17 19:27:18.147210531 +0100 +++ /home/mlj/rpm/BUILD/mpgtx-1.3.1/configure 2005-01-17 19:27:25.256295773 +0100 @@ -12,7 +12,7 @@ CC="g++" common_cflags="-Wall" devel_cflags="-g -Werror -fno-builtin" -optimization_cflags="-O3" +optimization_cflags="$RPM_OPT_FLAGS" release_cflags=$optimization_cflags OFLAGS="-ansi" cflags=$common_cflags @@ -206,7 +206,6 @@ fi if test $devel = "no" -a $debug = "no"; then -lflags="$lflags -s"; cflags="$cflags $optimization_cflags"; fi @@ -321,7 +320,7 @@ install -d -m 755 \$(INSTALLDIR) install -d -m 755 \$(MANDIR) install -d -m 755 \$(MANDIRDE) - install -s -m 755 mpgtx \$(INSTALLDIR) + install -m 755 mpgtx \$(INSTALLDIR) cp -\$(cpflags)f mpgdemux mpgjoin mpgcat mpginfo mpgsplit tagmp3 \$(INSTALLDIR) install -m 644 man/mpgtx.1 man/tagmp3.1 \$(MANDIR) install -m 644 man/de/mpgtx.1 man/de/tagmp3.1 \$(MANDIRDE) --- NEW FILE mpgtx.spec --- Name: mpgtx Version: 1.3.1 Release: 4%{?dist} Summary: An MPEG toolbox Group: Applications/Multimedia License: GPL URL: http://mpgtx.sourceforge.net/ Source0: http://dl.sf.net/mpgtx/mpgtx-1.3.1.tar.gz Patch0: mpgtx-1.3.1-makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description mpgtx allows you to split, join, demultiplex, manipulate ID3 tags and fetch detailed information about a variety of MPEG files. %prep %setup -q %patch0 -p6 -b .makefile for f in ChangeLog man/de/mpgtx.1 man/de/tagmp3.1 ; do iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f done %build ./configure --prefix=%{_prefix} make %install rm -rf $RPM_BUILD_ROOT make install PREFIX=$RPM_BUILD_ROOT%{_prefix} manprefix=$RPM_BUILD_ROOT%{_datadir} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README %{_bindir}/* %{_mandir}/man1/* %lang(de) %{_mandir}/de/man1/* %changelog * Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.3.1-4 - rebuild * Sun Oct 7 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.3.1-3 - Fix empty debuginfo package (#993). - Convert docs to UTF-8. - %%lang'ify German man pages. * Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 1.3.1-2 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 * 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 * Mon Jan 17 2005 Marius L. Jøhndal <mariuslj at ifi.uio.no> - 0:1.3.1-0.lvn.1 - Updated to 1.3.1. * Wed Dec 8 2004 Dams <anvil[AT]livna.org> - 0:1.3-0.lvn.4 - Patch0 needs -p6, not -p0. * Thu Oct 28 2004 Marius L. Jøhndal <mariuslj at ifi.uio.no> - 0:1.3-0.lvn.3 - Fixed build patch for FC3 compilation. * Tue Apr 8 2003 Marius L. Jøhndal <mariuslj at ifi.uio.no> - 0:1.3-0.fdr.2 - Added epoch. - Modified source URL to allow direct downloading. * Sat Mar 20 2003 Marius L. Jøhndal <mariuslj at ifi.uio.no> - 1.3-0.fdr.1 - Initial Fedora RPM release. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/mpgtx/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 29 Jul 2008 18:14:03 -0000 1.1 +++ .cvsignore 4 Aug 2008 18:28:19 -0000 1.2 @@ -0,0 +1 @@ +mpgtx-1.3.1.tar.gz Index: sources =================================================================== RCS file: /cvs/free/rpms/mpgtx/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 29 Jul 2008 18:14:03 -0000 1.1 +++ sources 4 Aug 2008 18:28:19 -0000 1.2 @@ -0,0 +1 @@ +d628060aa04ad3b40a175bf35f5167cf mpgtx-1.3.1.tar.gz

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