rpms/gstreamer1-libav/F-20 .cvsignore, 1.10, 1.11 gstreamer1-libav.spec, 1.13, 1.14 sources, 1.10, 1.11
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/gstreamer1-libav/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25790
Modified Files:
.cvsignore gstreamer1-libav.spec sources
Log Message:
* Fri Aug 29 2014 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.2.4-2
- Update libav to 9.16
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gstreamer1-libav/F-20/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 15 Jun 2014 10:48:08 -0000 1.10
+++ .cvsignore 29 Aug 2014 12:42:09 -0000 1.11
@@ -1,2 +1,2 @@
gst-libav-1.2.4.tar.xz
-libav-9.13.tar.xz
+libav-9.16.tar.xz
Index: gstreamer1-libav.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer1-libav/F-20/gstreamer1-libav.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gstreamer1-libav.spec 15 Jun 2014 10:48:08 -0000 1.13
+++ gstreamer1-libav.spec 29 Aug 2014 12:42:09 -0000 1.14
@@ -1,13 +1,13 @@
Name: gstreamer1-libav
Version: 1.2.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: GStreamer 1.0 libav-based plug-ins
Group: Applications/Multimedia
License: LGPLv2+
URL: http://gstreamer.freedesktop.org/
Source0: http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-%{version}.tar.xz
# We drop in a newer libav to get all the security bugfixes from there!
-Source1: http://libav.org/releases/libav-9.13.tar.xz
+Source1: http://libav.org/releases/libav-9.16.tar.xz
Patch0: gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch
BuildRequires: gstreamer1-devel >= 1.0.0
BuildRequires: gstreamer1-plugins-base-devel >= 1.0.0
@@ -30,7 +30,7 @@
%prep
%setup -q -n gst-libav-%{version} -a 1
rm -r gst-libs/ext/libav
-mv libav-9.13 gst-libs/ext/libav
+mv libav-9.16 gst-libs/ext/libav
%patch0 -p1
@@ -53,6 +53,9 @@
%changelog
+* Fri Aug 29 2014 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.2.4-2
+- Update libav to 9.16
+
* Sun Jun 15 2014 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.2.4-1
- Update to 1.2.4 (rf#3269)
- Update libav to 9.13
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gstreamer1-libav/F-20/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 15 Jun 2014 10:48:08 -0000 1.10
+++ sources 29 Aug 2014 12:42:09 -0000 1.11
@@ -1,2 +1,2 @@
6454f9f22b3aa37694781633e0d20a9c gst-libav-1.2.4.tar.xz
-23b9e34bffdaee366710fdf20157a570 libav-9.13.tar.xz
+7b44b75cec24b8e7545e5029e76917e0 libav-9.16.tar.xz
10 years, 4 months
rpms/steam/F-19 .cvsignore, 1.4, 1.5 sources, 1.6, 1.7 steam.spec, 1.13, 1.14
by Simone Caronni
Author: slaanesh
Update of /cvs/nonfree/rpms/steam/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28144
Modified Files:
.cvsignore sources steam.spec
Log Message:
* Wed Aug 27 2014 Simone Caronni <negativo17(a)gmail.com> - 1.0.0.49-1
- Update to 1.0.0.49.
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/steam/F-19/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 7 Jul 2014 10:01:42 -0000 1.4
+++ .cvsignore 27 Aug 2014 09:49:44 -0000 1.5
@@ -1 +1 @@
-steam_1.0.0.48.tar.gz
+steam_1.0.0.49.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/steam/F-19/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 7 Jul 2014 10:01:42 -0000 1.6
+++ sources 27 Aug 2014 09:49:44 -0000 1.7
@@ -1 +1 @@
-d0d9b46bb44d3a3b6b1b44304afe7995 steam_1.0.0.48.tar.gz
+2ec8c8172fd34a1c0d007d7250509f42 steam_1.0.0.49.tar.gz
Index: steam.spec
===================================================================
RCS file: /cvs/nonfree/rpms/steam/F-19/steam.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- steam.spec 5 Aug 2014 07:00:13 -0000 1.13
+++ steam.spec 27 Aug 2014 09:49:44 -0000 1.14
@@ -2,8 +2,8 @@
%global debug_package %{nil}
Name: steam
-Version: 1.0.0.48
-Release: 3%{?dist}
+Version: 1.0.0.49
+Release: 1%{?dist}
Summary: Installer for the Steam software distribution service
# Redistribution and repackaging for Linux is allowed, see license file
License: Steam License Agreement
@@ -83,6 +83,9 @@
%{_udevrulesdir}/99-steam-controller-perms.rules
%changelog
+* Wed Aug 27 2014 Simone Caronni <negativo17(a)gmail.com> - 1.0.0.49-1
+- Update to 1.0.0.49.
+
* Tue Jul 29 2014 Simone Caronni <negativo17(a)gmail.com> - 1.0.0.48-3
- Obsolete noruntime subpackage.
10 years, 4 months
rpms/steam/F-20 .cvsignore, 1.5, 1.6 sources, 1.6, 1.7 steam.spec, 1.13, 1.14
by Simone Caronni
Author: slaanesh
Update of /cvs/nonfree/rpms/steam/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28042
Modified Files:
.cvsignore sources steam.spec
Log Message:
* Wed Aug 27 2014 Simone Caronni <negativo17(a)gmail.com> - 1.0.0.49-1
- Update to 1.0.0.49.
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/steam/F-20/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 7 Jul 2014 10:01:26 -0000 1.5
+++ .cvsignore 27 Aug 2014 09:49:32 -0000 1.6
@@ -1 +1 @@
-steam_1.0.0.48.tar.gz
+steam_1.0.0.49.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/steam/F-20/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 7 Jul 2014 10:01:26 -0000 1.6
+++ sources 27 Aug 2014 09:49:32 -0000 1.7
@@ -1 +1 @@
-d0d9b46bb44d3a3b6b1b44304afe7995 steam_1.0.0.48.tar.gz
+2ec8c8172fd34a1c0d007d7250509f42 steam_1.0.0.49.tar.gz
Index: steam.spec
===================================================================
RCS file: /cvs/nonfree/rpms/steam/F-20/steam.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- steam.spec 5 Aug 2014 06:59:43 -0000 1.13
+++ steam.spec 27 Aug 2014 09:49:32 -0000 1.14
@@ -2,8 +2,8 @@
%global debug_package %{nil}
Name: steam
-Version: 1.0.0.48
-Release: 3%{?dist}
+Version: 1.0.0.49
+Release: 1%{?dist}
Summary: Installer for the Steam software distribution service
# Redistribution and repackaging for Linux is allowed, see license file
License: Steam License Agreement
@@ -83,6 +83,9 @@
%{_udevrulesdir}/99-steam-controller-perms.rules
%changelog
+* Wed Aug 27 2014 Simone Caronni <negativo17(a)gmail.com> - 1.0.0.49-1
+- Update to 1.0.0.49.
+
* Tue Jul 29 2014 Simone Caronni <negativo17(a)gmail.com> - 1.0.0.48-3
- Obsolete noruntime subpackage.
10 years, 4 months
rpms/steam/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 steam.spec, 1.13, 1.14
by Simone Caronni
Author: slaanesh
Update of /cvs/nonfree/rpms/steam/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27912
Modified Files:
.cvsignore sources steam.spec
Log Message:
* Wed Aug 27 2014 Simone Caronni <negativo17(a)gmail.com> - 1.0.0.49-1
- Update to 1.0.0.49.
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/steam/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 7 Jul 2014 10:00:36 -0000 1.7
+++ .cvsignore 27 Aug 2014 09:48:45 -0000 1.8
@@ -1 +1 @@
-steam_1.0.0.48.tar.gz
+steam_1.0.0.49.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/steam/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 7 Jul 2014 10:00:36 -0000 1.7
+++ sources 27 Aug 2014 09:48:45 -0000 1.8
@@ -1 +1 @@
-d0d9b46bb44d3a3b6b1b44304afe7995 steam_1.0.0.48.tar.gz
+2ec8c8172fd34a1c0d007d7250509f42 steam_1.0.0.49.tar.gz
Index: steam.spec
===================================================================
RCS file: /cvs/nonfree/rpms/steam/devel/steam.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- steam.spec 5 Aug 2014 06:58:51 -0000 1.13
+++ steam.spec 27 Aug 2014 09:48:45 -0000 1.14
@@ -2,8 +2,8 @@
%global debug_package %{nil}
Name: steam
-Version: 1.0.0.48
-Release: 3%{?dist}
+Version: 1.0.0.49
+Release: 1%{?dist}
Summary: Installer for the Steam software distribution service
# Redistribution and repackaging for Linux is allowed, see license file
License: Steam License Agreement
@@ -83,6 +83,9 @@
%{_udevrulesdir}/99-steam-controller-perms.rules
%changelog
+* Wed Aug 27 2014 Simone Caronni <negativo17(a)gmail.com> - 1.0.0.49-1
+- Update to 1.0.0.49.
+
* Tue Jul 29 2014 Simone Caronni <negativo17(a)gmail.com> - 1.0.0.48-3
- Obsolete noruntime subpackage.
10 years, 4 months
rpms/xine-lib-extras-freeworld/EL-5 xine-lib-1.1.19-no_autopoint.patch, NONE, 1.1 xine-lib-1.1.4-optflags.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 xine-lib-extras-freeworld.spec, 1.13, 1.14 xine-lib-1.1.1-deepbind-939.patch, 1.1, NONE xine-lib-1.1.3-optflags.patch, 1.1, NONE
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/xine-lib-extras-freeworld/EL-5
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4197
Modified Files:
.cvsignore sources xine-lib-extras-freeworld.spec
Added Files:
xine-lib-1.1.19-no_autopoint.patch
xine-lib-1.1.4-optflags.patch
Removed Files:
xine-lib-1.1.1-deepbind-939.patch
xine-lib-1.1.3-optflags.patch
Log Message:
sync w/F-19 branch for 1.1.21
xine-lib-1.1.19-no_autopoint.patch:
autogen.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE xine-lib-1.1.19-no_autopoint.patch ---
diff -up xine-lib-1.1.17/autogen.sh.no_autopoint xine-lib-1.1.17/autogen.sh
--- xine-lib-1.1.17/autogen.sh.no_autopoint 2009-10-09 09:33:31.000000000 -0500
+++ xine-lib-1.1.17/autogen.sh 2009-12-02 09:15:48.534555467 -0600
@@ -229,10 +229,10 @@ run_aclocal () {
echo
fi
- echo $_echo_n " + Running autopoint: $_echo_c"
+ #echo $_echo_n " + Running autopoint: $_echo_c"
- autopoint
- echo "done."
+ #autopoint
+ #echo "done."
echo $_echo_n " + Running aclocal: $_echo_c"
xine-lib-1.1.4-optflags.patch:
optimizations.m4 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE xine-lib-1.1.4-optflags.patch ---
--- xine-lib-1.1.4/m4/optimizations.m4~ 2006-06-17 18:20:56.000000000 +0300
+++ xine-lib-1.1.4/m4/optimizations.m4 2007-01-30 23:03:27.000000000 +0200
@@ -107,7 +107,7 @@
DEBUG_CFLAGS="-O $DEBUG_CFLAGS"
- if test x"$sarchopt" != "xno"; then
+ if false ; then
archopt_val=
case "$host_or_hostalias" in
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 9 Apr 2009 13:29:48 -0000 1.7
+++ .cvsignore 26 Aug 2014 21:38:27 -0000 1.8
@@ -1 +1 @@
-xine-lib-1.1.16.3.tar.bz2
+xine-lib-1.1.21.tar.xz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 9 Apr 2009 13:29:48 -0000 1.7
+++ sources 26 Aug 2014 21:38:27 -0000 1.8
@@ -1 +1 @@
-4f508abf088cf427a731f85634c8260d xine-lib-1.1.16.3.tar.bz2
+d0163d4f9d7613fb050c5c2205973336 xine-lib-1.1.21.tar.xz
Index: xine-lib-extras-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/EL-5/xine-lib-extras-freeworld.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xine-lib-extras-freeworld.spec 9 Apr 2009 13:29:48 -0000 1.13
+++ xine-lib-extras-freeworld.spec 26 Aug 2014 21:38:27 -0000 1.14
@@ -1,37 +1,25 @@
-# TODO:
-# - external dvdnav - not compatible as of 1.1.11 and 4.1.1
-%define plugin_abi 1.26
-
-%if 0%{?fedora} > 6
-%define _with_external_ffmpeg --with-external-ffmpeg
-%define _with_external_libfaad --with-external-libfaad
-%endif
+%define plugin_abi 1.30
Name: xine-lib-extras-freeworld
Summary: Extra codecs for the Xine multimedia library
-Version: 1.1.16.3
-Release: 1%{?dist}
+Version: 1.1.21
+Release: 6%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://xinehq.de/
-Source0: http://downloads.sourceforge.net/xine/xine-lib-%{version}.tar.bz2
+Source0: http://downloads.sourceforge.net/xine/xine-lib-%{version}.tar.xz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0: xine-lib-1.1.3-optflags.patch
-Patch6: xine-lib-1.1.1-deepbind-939.patch
+Patch0: xine-lib-1.1.19-no_autopoint.patch
+Patch1: xine-lib-1.1.4-optflags.patch
+BuildRequires: autoconf automake libtool
BuildRequires: pkgconfig
BuildRequires: zlib-devel
BuildRequires: gawk
-%if 0%{?_with_external_libfaad:1}
BuildRequires: faad2-devel
-%endif
-%if 0%{?_with_external_ffmpeg:1}
BuildRequires: ffmpeg-devel >= 0.4.9-0.22.20060804
-# HACKS to workaround missing deps in ffmpeg-devel
-# BuildRequires: dirac-devel libraw1394-devel libtheora-devel libvorbis-devel
-%endif
BuildRequires: a52dec-devel
BuildRequires: libmad-devel
BuildRequires: libdca-devel
@@ -42,12 +30,16 @@
# vcdimager reads and writes MPEG
BuildRequires: vcdimager-devel >= 0.7.23
BuildRequires: sed
+BuildRequires: libdvdnav-devel
+BuildRequires: libdvdread-devel
# Obsolete DXR3 deps, better handled by ffmpeg
BuildConflicts: rte-devel
BuildConflicts: libfame-devel
Requires: vcdimager >= 0.7.23
Requires: xine-lib(plugin-abi)%{?_isa} = %{plugin_abi}
+# DVD plugin moved to Fedora (not encumbered)
+Requires: xine-lib >= 1.1.21-2
# obsolete old livna package
Provides: xine-lib-extras-nonfree = %{version}-%{release}
@@ -66,14 +58,13 @@
%prep
%setup -q -n xine-lib-%{version}
-touch -r m4/optimizations.m4 m4/optimizations.m4.stamp
-%patch0 -p1 -b .optflags
-touch -r m4/optimizations.m4.stamp m4/optimizations.m4
-# when compiling with external ffmpeg and internal libfaad #939.
-#patch6 -p1 -b .deepbind
-# Avoid standard rpaths on lib64 archs:
-sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
+%patch0 -p1 -b .no_autopoint
+# extra work for to omit old libtool-related crud
+rm -f configure ltmain.sh libtool m4/libtool.m4 m4/ltoptions.m4 m4/ltversion.m4
+%patch1 -p1 -b .optflags
+
+./autogen.sh noconfig
%build
@@ -84,24 +75,25 @@
--disable-opengl \
--disable-xvmc \
--disable-aalib \
- --disable-caca \
- --disable-sdl \
- --disable-rte \
- --disable-libfame \
- --disable-speex \
- --disable-flac \
+ --disable-musepack \
--disable-mng \
- --disable-imagemagick \
- --disable-freetype \
- --disable-alsa \
- --disable-esd \
- --disable-arts \
--disable-gnomevfs \
--disable-gdkpixbuf \
--disable-samba \
- %{?_with_external_ffmpeg} \
+ --with-external-ffmpeg \
+ --without-caca \
+ --without-sdl \
+ --without-speex \
+ --without-libflac \
--with-external-a52dec \
--with-external-libmad \
+ --without-imagemagick \
+ --without-freetype \
+ --without-alsa \
+ --without-esound \
+ --without-arts \
+ --with-external-dvdnav \
+ --with-external-libfaad \
--with-external-libdts
make %{?_smp_mflags}
@@ -151,9 +143,6 @@
xineplug_decode_dxr3_video
xineplug_vo_out_dxr3
#
-# DVD reading
-xineplug_inp_dvd
-#
# http://www.videolan.org/dtsdec.html
xineplug_decode_dts
#
@@ -181,12 +170,86 @@
%files
%defattr(-,root,root,-)
-%doc doc/README.dxr3 doc/README.network_dvd
+%doc doc/README.dxr3
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_*.so
%{_libdir}/xine/plugins/%{plugin_abi}/post/xineplug_*.so
%changelog
+* Sun May 26 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.21-6
+- Rebuilt for x264/FFmpeg
+
+* Wed Jan 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.21-5
+- Rebuilt for ffmpeg
+
+* Sat Nov 24 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.21-4
+- Rebuilt for FFmpeg 1.0
+
+* Mon Jul 16 2012 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 1.1.21-3
+- drop DVD plugin, not encumbered (by itself), moved to Fedora
+
+* Tue Jun 26 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.21-2
+- Rebuilt for FFmpeg
+
+* Sat Jun 23 2012 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 1.1.21-1
+- update to 1.1.21 (bugfix release, matches Fedora xine-lib)
+
+* Fri Mar 09 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.20.1-2
+- Rebuilt
+
+* Tue Jan 03 2012 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 1.1.20.1-1
+- update to 1.1.20.1 (bugfix release, matches Fedora xine-lib)
+- drop upstreamed link-libdvdread and system-a52dec patches
+
+* Fri Nov 25 2011 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 1.1.20-3
+- --disable-musepack, avoids building the unused bundled libmusepack (the
+ musepack plugin (using the system lib) is included in the Fedora xine-lib)
+
+* Thu Nov 24 2011 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 1.1.20-2
+- don't check for and include a52_internal.h, fixes system a52dec support
+
+* Tue Nov 22 2011 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 1.1.20-1
+- update to 1.1.20 (matches Fedora xine-lib)
+- use .xz tarball
+- drop old conditionals
+- drop unused deepbind patch
+- use the system libdvdnav (and libdvdread) instead of the bundled one
+- fix system libdvdnav support to also link libdvdread
+- run autogen.sh in %%prep, don't patch generated files
+- drop ffmpeg08 patch, fixed upstream
+- update configure flags (drop nonexistent ones, fix renamed ones)
+- plugin ABI is now 1.30
+
+* Thu Sep 29 2011 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 1.1.19-3
+- fix build with FFmpeg 0.8 (#1957)
+
+* Mon Sep 26 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.19-2
+- Rebuilt for FFmpeg-0.8
+
+* Sun Jul 25 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.19-1
+- xine-lib-1.1.19
+
+* Sun Mar 07 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.18.1-1
+- xine-lib-1.1.18.1
+
+* Tue Mar 02 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.18-3
+- get missing/upstream compat.c
+
+* Mon Mar 01 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.18-2
+- better dxr3_no_compat_c.patch (s/compat.c/compat.h/)
+
+* Wed Feb 24 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.18-1
+- xine-lib-1.1.18, plugin-abi 1.28
+
+* Fri Jan 22 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.17-2
+- rebuild (libcdio)
+
+* Wed Dec 02 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.17-1
+- xine-lib-1.1.17, plugin-abi 1.27
+
+* Thu Jul 02 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.16.3-2
+- rebuild (DirectFB)
+
* Fri Apr 03 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.16.3-1
- xine-lib-1.1.16.3, plugin-abi 1.26
--- xine-lib-1.1.1-deepbind-939.patch DELETED ---
--- xine-lib-1.1.3-optflags.patch DELETED ---
10 years, 4 months
rpms/xine-lib-extras-freeworld/EL-6 xine-lib-1.1.19-no_autopoint.patch, 1.2, 1.3 xine-lib-1.1.4-optflags.patch, 1.2, 1.3 .cvsignore, 1.16, 1.17 sources, 1.16, 1.17 xine-lib-extras-freeworld.spec, 1.55, 1.56 xine-lib-1.1.1-deepbind-939.patch, 1.3, NONE xine-lib-1.1.18-ffmpeg.patch, 1.1, NONE xine-lib-1.1.3-optflags.patch, 1.3, NONE
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/xine-lib-extras-freeworld/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3907
Modified Files:
.cvsignore sources xine-lib-extras-freeworld.spec
Added Files:
xine-lib-1.1.19-no_autopoint.patch
xine-lib-1.1.4-optflags.patch
Removed Files:
xine-lib-1.1.1-deepbind-939.patch xine-lib-1.1.18-ffmpeg.patch
xine-lib-1.1.3-optflags.patch
Log Message:
sync with F-19 branch, for 1.1.21
xine-lib-1.1.19-no_autopoint.patch:
autogen.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Index: xine-lib-1.1.19-no_autopoint.patch
===================================================================
RCS file: xine-lib-1.1.19-no_autopoint.patch
diff -N xine-lib-1.1.19-no_autopoint.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ xine-lib-1.1.19-no_autopoint.patch 26 Aug 2014 21:36:27 -0000 1.3
@@ -0,0 +1,17 @@
+diff -up xine-lib-1.1.17/autogen.sh.no_autopoint xine-lib-1.1.17/autogen.sh
+--- xine-lib-1.1.17/autogen.sh.no_autopoint 2009-10-09 09:33:31.000000000 -0500
++++ xine-lib-1.1.17/autogen.sh 2009-12-02 09:15:48.534555467 -0600
+@@ -229,10 +229,10 @@ run_aclocal () {
+ echo
+ fi
+
+- echo $_echo_n " + Running autopoint: $_echo_c"
++ #echo $_echo_n " + Running autopoint: $_echo_c"
+
+- autopoint
+- echo "done."
++ #autopoint
++ #echo "done."
+
+ echo $_echo_n " + Running aclocal: $_echo_c"
+
xine-lib-1.1.4-optflags.patch:
optimizations.m4 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: xine-lib-1.1.4-optflags.patch
===================================================================
RCS file: xine-lib-1.1.4-optflags.patch
diff -N xine-lib-1.1.4-optflags.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ xine-lib-1.1.4-optflags.patch 26 Aug 2014 21:36:27 -0000 1.3
@@ -0,0 +1,11 @@
+--- xine-lib-1.1.4/m4/optimizations.m4~ 2006-06-17 18:20:56.000000000 +0300
++++ xine-lib-1.1.4/m4/optimizations.m4 2007-01-30 23:03:27.000000000 +0200
+@@ -107,7 +107,7 @@
+
+ DEBUG_CFLAGS="-O $DEBUG_CFLAGS"
+
+- if test x"$sarchopt" != "xno"; then
++ if false ; then
+ archopt_val=
+
+ case "$host_or_hostalias" in
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/EL-6/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore 7 Dec 2013 18:36:30 -0000 1.16
+++ .cvsignore 26 Aug 2014 21:36:27 -0000 1.17
@@ -1 +1 @@
-xine-lib-1.1.18.1.tar.bz2
+xine-lib-1.1.21.tar.xz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/EL-6/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 7 Dec 2013 18:36:30 -0000 1.16
+++ sources 26 Aug 2014 21:36:27 -0000 1.17
@@ -1 +1 @@
-3efad551f2f8a9c5734855a6639694ef xine-lib-1.1.18.1.tar.bz2
+d0163d4f9d7613fb050c5c2205973336 xine-lib-1.1.21.tar.xz
Index: xine-lib-extras-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/EL-6/xine-lib-extras-freeworld.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- xine-lib-extras-freeworld.spec 7 Dec 2013 18:36:30 -0000 1.55
+++ xine-lib-extras-freeworld.spec 26 Aug 2014 21:36:27 -0000 1.56
@@ -1,38 +1,25 @@
-# TODO:
-# - external dvdnav - not compatible as of 1.1.11 and 4.1.1
-%define plugin_abi 1.28
-
-%if 0%{?fedora} > 6 || 0%{?rhel} > 4
-%define _with_external_ffmpeg --with-external-ffmpeg
-%define _with_external_libfaad --with-external-libfaad
-%endif
+%define plugin_abi 1.30
Name: xine-lib-extras-freeworld
Summary: Extra codecs for the Xine multimedia library
-Version: 1.1.18.1
-Release: 2%{?dist}
+Version: 1.1.21
+Release: 6%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://xinehq.de/
-Source0: http://downloads.sourceforge.net/xine/xine-lib-%{version}.tar.bz2
+Source0: http://downloads.sourceforge.net/xine/xine-lib-%{version}.tar.xz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0: xine-lib-1.1.3-optflags.patch
-Patch1: xine-lib-1.1.18-ffmpeg.patch
-Patch6: xine-lib-1.1.1-deepbind-939.patch
-
-## upstreamable patches
+Patch0: xine-lib-1.1.19-no_autopoint.patch
+Patch1: xine-lib-1.1.4-optflags.patch
+BuildRequires: autoconf automake libtool
BuildRequires: pkgconfig
BuildRequires: zlib-devel
BuildRequires: gawk
-%if 0%{?_with_external_libfaad:1}
BuildRequires: faad2-devel
-%endif
-%if 0%{?_with_external_ffmpeg:1}
BuildRequires: ffmpeg-devel >= 0.4.9-0.22.20060804
-%endif
BuildRequires: a52dec-devel
BuildRequires: libmad-devel
BuildRequires: libdca-devel
@@ -43,12 +30,16 @@
# vcdimager reads and writes MPEG
BuildRequires: vcdimager-devel >= 0.7.23
BuildRequires: sed
+BuildRequires: libdvdnav-devel
+BuildRequires: libdvdread-devel
# Obsolete DXR3 deps, better handled by ffmpeg
BuildConflicts: rte-devel
BuildConflicts: libfame-devel
Requires: vcdimager >= 0.7.23
Requires: xine-lib(plugin-abi)%{?_isa} = %{plugin_abi}
+# DVD plugin moved to Fedora (not encumbered)
+Requires: xine-lib >= 1.1.21-2
# obsolete old livna package
Provides: xine-lib-extras-nonfree = %{version}-%{release}
@@ -68,15 +59,12 @@
%prep
%setup -q -n xine-lib-%{version}
-touch -r m4/optimizations.m4 m4/optimizations.m4.stamp
-%patch0 -p1 -b .optflags
-touch -r m4/optimizations.m4.stamp m4/optimizations.m4
-%patch1 -p1 -b .ffmpeg
-# when compiling with external ffmpeg and internal libfaad #939.
-#patch6 -p1 -b .deepbind
+%patch0 -p1 -b .no_autopoint
+# extra work for to omit old libtool-related crud
+rm -f configure ltmain.sh libtool m4/libtool.m4 m4/ltoptions.m4 m4/ltversion.m4
+%patch1 -p1 -b .optflags
-# Avoid standard rpaths on lib64 archs:
-sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
+./autogen.sh noconfig
%build
@@ -87,24 +75,25 @@
--disable-opengl \
--disable-xvmc \
--disable-aalib \
- --disable-caca \
- --disable-sdl \
- --disable-rte \
- --disable-libfame \
- --disable-speex \
- --disable-flac \
+ --disable-musepack \
--disable-mng \
- --disable-imagemagick \
- --disable-freetype \
- --disable-alsa \
- --disable-esd \
- --disable-arts \
--disable-gnomevfs \
--disable-gdkpixbuf \
--disable-samba \
- %{?_with_external_ffmpeg} \
+ --with-external-ffmpeg \
+ --without-caca \
+ --without-sdl \
+ --without-speex \
+ --without-libflac \
--with-external-a52dec \
--with-external-libmad \
+ --without-imagemagick \
+ --without-freetype \
+ --without-alsa \
+ --without-esound \
+ --without-arts \
+ --with-external-dvdnav \
+ --with-external-libfaad \
--with-external-libdts
make %{?_smp_mflags}
@@ -154,9 +143,6 @@
xineplug_decode_dxr3_video
xineplug_vo_out_dxr3
#
-# DVD reading
-xineplug_inp_dvd
-#
# http://www.videolan.org/dtsdec.html
xineplug_decode_dts
#
@@ -184,14 +170,64 @@
%files
%defattr(-,root,root,-)
-%doc doc/README.dxr3 doc/README.network_dvd
+%doc doc/README.dxr3
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_*.so
%{_libdir}/xine/plugins/%{plugin_abi}/post/xineplug_*.so
%changelog
-* Sat Dec 07 2013 Robert Scheck <robert(a)fedoraproject.org> 1.1.18.1-2
-- Rebuild for Red Hat Enterprise Linux 6 (RFBZ #3052)
+* Sun May 26 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.21-6
+- Rebuilt for x264/FFmpeg
+
+* Wed Jan 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.21-5
+- Rebuilt for ffmpeg
+
+* Sat Nov 24 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.21-4
+- Rebuilt for FFmpeg 1.0
+
+* Mon Jul 16 2012 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 1.1.21-3
+- drop DVD plugin, not encumbered (by itself), moved to Fedora
+
+* Tue Jun 26 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.21-2
+- Rebuilt for FFmpeg
+
+* Sat Jun 23 2012 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 1.1.21-1
+- update to 1.1.21 (bugfix release, matches Fedora xine-lib)
+
+* Fri Mar 09 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.20.1-2
+- Rebuilt
+
+* Tue Jan 03 2012 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 1.1.20.1-1
+- update to 1.1.20.1 (bugfix release, matches Fedora xine-lib)
+- drop upstreamed link-libdvdread and system-a52dec patches
+
+* Fri Nov 25 2011 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 1.1.20-3
+- --disable-musepack, avoids building the unused bundled libmusepack (the
+ musepack plugin (using the system lib) is included in the Fedora xine-lib)
+
+* Thu Nov 24 2011 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 1.1.20-2
+- don't check for and include a52_internal.h, fixes system a52dec support
+
+* Tue Nov 22 2011 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 1.1.20-1
+- update to 1.1.20 (matches Fedora xine-lib)
+- use .xz tarball
+- drop old conditionals
+- drop unused deepbind patch
+- use the system libdvdnav (and libdvdread) instead of the bundled one
+- fix system libdvdnav support to also link libdvdread
+- run autogen.sh in %%prep, don't patch generated files
+- drop ffmpeg08 patch, fixed upstream
+- update configure flags (drop nonexistent ones, fix renamed ones)
+- plugin ABI is now 1.30
+
+* Thu Sep 29 2011 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 1.1.19-3
+- fix build with FFmpeg 0.8 (#1957)
+
+* Mon Sep 26 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.19-2
+- Rebuilt for FFmpeg-0.8
+
+* Sun Jul 25 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.19-1
+- xine-lib-1.1.19
* Sun Mar 07 2010 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.18.1-1
- xine-lib-1.1.18.1
--- xine-lib-1.1.1-deepbind-939.patch DELETED ---
--- xine-lib-1.1.18-ffmpeg.patch DELETED ---
--- xine-lib-1.1.3-optflags.patch DELETED ---
10 years, 4 months
rpms/libmpeg3/devel 20140826_git395120d.patch, NONE, 1.1 libmpeg3.spec, 1.8, 1.9 libmpeg3-1.5.2-gnustack.patch, 1.1, NONE libmpeg3-1.7-boostrap.patch, 1.1, NONE libmpeg3-1.7-cinelerra_hacking.patch, 1.1, NONE libmpeg3-1.7-fix_commented.patch, 1.1, NONE libmpeg3-1.7-mpeg2qt-args.patch, 1.1, NONE libmpeg3-1.7-pkgconfig.in.patch, 1.1, NONE libmpeg3-1.7-spec_in.patch, 1.1, NONE libmpeg3-1.8-cinelerra_autotools.patch, 1.1, NONE libmpeg3-1.8-mmx.patch, 1.1, NONE
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/libmpeg3/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24971
Modified Files:
libmpeg3.spec
Added Files:
20140826_git395120d.patch
Removed Files:
libmpeg3-1.5.2-gnustack.patch libmpeg3-1.7-boostrap.patch
libmpeg3-1.7-cinelerra_hacking.patch
libmpeg3-1.7-fix_commented.patch
libmpeg3-1.7-mpeg2qt-args.patch
libmpeg3-1.7-pkgconfig.in.patch libmpeg3-1.7-spec_in.patch
libmpeg3-1.8-cinelerra_autotools.patch libmpeg3-1.8-mmx.patch
Log Message:
prepare to build
20140826_git395120d.patch:
a52dec-0.7.3/AUTHORS | 20
a52dec-0.7.3/COPYING | 340 -
a52dec-0.7.3/ChangeLog | 92
a52dec-0.7.3/HISTORY | 22
a52dec-0.7.3/INSTALL | 5
a52dec-0.7.3/Makefile | 361 -
a52dec-0.7.3/Makefile.am | 3
a52dec-0.7.3/Makefile.in | 361 -
a52dec-0.7.3/NEWS | 37
a52dec-0.7.3/README | 177
a52dec-0.7.3/TODO | 10
a52dec-0.7.3/acinclude.m4 | 69
a52dec-0.7.3/aclocal.m4 | 3725 ------------
a52dec-0.7.3/bootstrap | 8
a52dec-0.7.3/config.log | 557 -
a52dec-0.7.3/config.status | 699 --
a52dec-0.7.3/configure | 9826 --------------------------------
a52dec-0.7.3/configure.in | 114
a52dec-0.7.3/include/Makefile | 263
a52dec-0.7.3/include/Makefile.am | 3
a52dec-0.7.3/include/Makefile.in | 263
a52dec-0.7.3/include/a52.h | 63
a52dec-0.7.3/include/attributes.h | 29
a52dec-0.7.3/include/audio_out.h | 64
a52dec-0.7.3/include/config.h | 97
a52dec-0.7.3/include/config.h.in | 96
a52dec-0.7.3/include/mm_accel.h | 37
a52dec-0.7.3/include/stamp-h | 1
a52dec-0.7.3/include/stamp-h.in | 1
a52dec-0.7.3/include/tendra.h | 35
a52dec-0.7.3/liba52/Makefile | 332 -
a52dec-0.7.3/liba52/Makefile.am | 9
a52dec-0.7.3/liba52/Makefile.in | 332 -
a52dec-0.7.3/liba52/a52_internal.h | 115
a52dec-0.7.3/liba52/bit_allocate.c | 265
a52dec-0.7.3/liba52/bitstream.c | 103
a52dec-0.7.3/liba52/bitstream.h | 82
a52dec-0.7.3/liba52/configure.incl | 19
a52dec-0.7.3/liba52/downmix.c | 655 --
a52dec-0.7.3/liba52/imdct.c | 448 -
a52dec-0.7.3/liba52/parse.c | 900 --
a52dec-0.7.3/liba52/tables.h | 246
a52dec-0.7.3/libao/Makefile | 321 -
a52dec-0.7.3/libao/Makefile.am | 6
a52dec-0.7.3/libao/Makefile.in | 321 -
a52dec-0.7.3/libao/audio_out.c | 82
a52dec-0.7.3/libao/audio_out_aif.c | 151
a52dec-0.7.3/libao/audio_out_float.c | 68
a52dec-0.7.3/libao/audio_out_internal.h | 37
a52dec-0.7.3/libao/audio_out_null.c | 78
a52dec-0.7.3/libao/audio_out_oss.c | 194
a52dec-0.7.3/libao/audio_out_solaris.c | 166
a52dec-0.7.3/libao/audio_out_wav.c | 145
a52dec-0.7.3/libao/configure.incl | 34
a52dec-0.7.3/libao/float2s16.c | 178
a52dec-0.7.3/libtool | 5315 -----------------
a52dec-0.7.3/src/Makefile | 381 -
a52dec-0.7.3/src/Makefile.am | 11
a52dec-0.7.3/src/Makefile.in | 381 -
a52dec-0.7.3/src/a52dec.1 | 43
a52dec-0.7.3/src/a52dec.c | 589 -
a52dec-0.7.3/src/configure.incl | 7
a52dec-0.7.3/src/extract_a52.1 | 32
a52dec-0.7.3/src/extract_a52.c | 354 -
a52dec-0.7.3/src/getopt.c | 1055 ---
a52dec-0.7.3/src/getopt.h | 169
a52dec-0.7.3/test/Makefile | 331 -
a52dec-0.7.3/test/Makefile.am | 6
a52dec-0.7.3/test/Makefile.in | 331 -
a52dec-0.7.3/test/compare.c | 79
a52dec-0.7.3/test/compile | 46
a52dec-0.7.3/test/globals | 24
a52dec-0.7.3/test/regression | 48
a52dec-0.7.3/test/tests | 10
a52dec-0.7.3/vc++/Makefile | 182
a52dec-0.7.3/vc++/Makefile.am | 1
a52dec-0.7.3/vc++/Makefile.in | 182
a52dec-0.7.3/vc++/a52dec.dsp | 108
a52dec-0.7.3/vc++/a52dec.dsw | 59
a52dec-0.7.3/vc++/config.h | 96
a52dec-0.7.3/vc++/inttypes.h | 13
a52dec-0.7.3/vc++/liba52.dsp | 128
a52dec-0.7.3/vc++/libao.dsp | 128
b/.gitignore | 23
b/COPYING | 72
b/Makefile.am | 61
b/audio/Makefile.am | 12
b/audio/ac3.c | 2
b/bootstrap | 7
b/configure.ac | 124
b/libmpeg3.c | 1
b/libmpeg3.h | 1
b/libmpeg3.pc.in | 12
b/libmpeg3.spec.in | 160
b/mpeg2qt.c | 5
b/mpeg3protos.h | 2
b/mpeg3toc.c | 2
b/video/Makefile.am | 29
b/video/mmxidct.S | 4
b/video/output.c | 2
b/video/reconmmx.s | 4
b/video/vlc.c | 3
depend.a52 | 27
103 files changed, 474 insertions(+), 32853 deletions(-)
--- NEW FILE 20140826_git395120d.patch ---
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4d40434
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,23 @@
+# Object files
+*.o
+*.ko
+*.obj
+*.elf
+
+# Libraries
+*.lib
+*.a
+
+# Shared objects (inc. Windows DLLs)
+*.dll
+*.so
+*.so.*
+*.dylib
+
+# Executables
+*.exe
+*.out
+*.app
+*.i*86
+*.x86_64
+*.hex
diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..e69de29
diff --git a/COPYING b/COPYING
index 1ad9cd3..22fbe5d 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,12 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
+GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc., <http://fsf.org/>
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
- Preamble
+ Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
+the GNU Lesser General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
@@ -56,18 +56,18 @@ patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
- GNU GENERAL PUBLIC LICENSE
+ GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The \"Program\", below,
-refers to any such program or work, and a \"work based on the Program\"
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language. (Hereinafter, translation is included without limitation in
-the term \"modification\".) Each licensee is addressed as \"you\".
+the term "modification".) Each licensee is addressed as "you".
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
@@ -240,8 +240,8 @@ be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and \"any
-later version\", you have the option of following the terms and conditions
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation. If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
@@ -255,12 +255,12 @@ make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
- NO WARRANTY
+ NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
@@ -277,26 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
- END OF TERMS AND CONDITIONS
+ END OF TERMS AND CONDITIONS
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- How to Apply These Terms to Your New Programs
+ How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
@@ -305,10 +288,10 @@ free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
-the \"copyright\" line and a pointer to where the full notice is found.
+the "copyright" line and a pointer to where the full notice is found.
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) 19yy <name of author>
+ {description}
+ Copyright (C) {year} {fullname}
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -320,17 +303,16 @@ the \"copyright\" line and a pointer to where the full notice is found.
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
- Gnomovision version 69, Copyright (C) 19yy name of author
+ Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
@@ -341,17 +323,17 @@ be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.
You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a \"copyright disclaimer\" for the program, if
+school, if any, to sign a "copyright disclaimer" for the program, if
necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
`Gnomovision' (which makes passes at compilers) written by James Hacker.
- <signature of Ty Coon>, 1 April 1989
+ {signature of Ty Coon}, 1 April 1989
Ty Coon, President of Vice
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
[...33706 lines suppressed...]
+#{_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)
diff --git a/mpeg2qt.c b/mpeg2qt.c
index 141237e..f2f1afc 100644
--- a/mpeg2qt.c
+++ b/mpeg2qt.c
@@ -71,6 +71,7 @@ void* trap_interrupt()
int main(int argc, char *argv[])
{
+ int error = 0;
int frame_count = -1;
char *row_pointers[3];
int do_audio = 0;
@@ -124,7 +125,7 @@ int main(int argc, char *argv[])
}
//printf("main 1\n");
- if(!(input = mpeg3_open(input_path)))
+ if(!(input = mpeg3_open(input_path, &error)))
{
exit(1);
}
@@ -180,7 +181,7 @@ int main(int argc, char *argv[])
//printf("main 1\n");
// quicktime_set_jpeg(output, 100, 0);
- mpeg3_set_mmx(input, 0);
+// mpeg3_set_mmx(input, 0);
while((!(do_video && mpeg3_end_of_video(input, layer)) ||
!(do_audio && mpeg3_end_of_audio(input, astream))) &&
diff --git a/mpeg3protos.h b/mpeg3protos.h
index c79a11b..6dec578 100644
--- a/mpeg3protos.h
+++ b/mpeg3protos.h
@@ -391,7 +391,7 @@ int mpeg3demux_open_title(mpeg3_demuxer_t *demuxer, int title_number);
/* 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);
diff --git a/mpeg3toc.c b/mpeg3toc.c
index f7c5284..50b201c 100644
--- a/mpeg3toc.c
+++ b/mpeg3toc.c
@@ -574,7 +574,7 @@ mpeg3demux_movie_size(input->atrack[j]->demuxer));
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 --git a/video/Makefile.am b/video/Makefile.am
new file mode 100644
index 0000000..cba6ff5
--- /dev/null
+++ b/video/Makefile.am
@@ -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)
diff --git a/video/mmxidct.S b/video/mmxidct.S
index 9c3bebe..e40e7c9 100644
--- a/video/mmxidct.S
+++ b/video/mmxidct.S
@@ -673,3 +673,7 @@ IDCT_mmx:
ret
.Lfe1:
.size IDCT_mmx,.Lfe1-IDCT_mmx
+
+#ifdef __ELF__
+.section .note.GNU-stack,"",%progbits
+#endif
diff --git a/video/output.c b/video/output.c
index 5c6f8fb..1c37d07 100644
--- a/video/output.c
+++ b/video/output.c
@@ -104,7 +104,7 @@ static unsigned char mpeg3_601_to_rgb[256];
*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 --git a/video/reconmmx.s b/video/reconmmx.s
index 1bb98ef..d9531cd 100644
--- a/video/reconmmx.s
+++ b/video/reconmmx.s
@@ -298,4 +298,6 @@ set_block_mmx:
pop esi
ret
-
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
diff --git a/video/vlc.c b/video/vlc.c
index 6ba853d..c20b2a8 100644
--- a/video/vlc.c
+++ b/video/vlc.c
@@ -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"
Index: libmpeg3.spec
===================================================================
RCS file: /cvs/free/rpms/libmpeg3/devel/libmpeg3.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libmpeg3.spec 26 Aug 2014 00:56:01 -0000 1.8
+++ libmpeg3.spec 26 Aug 2014 01:43:07 -0000 1.9
@@ -11,7 +11,7 @@
# git clone git@github.com:sergiomb2/libmpeg3.git
# tag=$(git rev-list HEAD -n 1 | cut -c 1-7)
# git diff 1.8 . > "$date"_git"$tag".patch
-Patch0: 20140826_git6589c5f.patch
+Patch0: 20140826_git395120d.patch
#BuildRequires: nasm
BuildRequires: a52dec-devel
--- libmpeg3-1.5.2-gnustack.patch DELETED ---
--- libmpeg3-1.7-boostrap.patch DELETED ---
--- libmpeg3-1.7-cinelerra_hacking.patch DELETED ---
--- libmpeg3-1.7-fix_commented.patch DELETED ---
--- libmpeg3-1.7-mpeg2qt-args.patch DELETED ---
--- libmpeg3-1.7-pkgconfig.in.patch DELETED ---
--- libmpeg3-1.7-spec_in.patch DELETED ---
--- libmpeg3-1.8-cinelerra_autotools.patch DELETED ---
--- libmpeg3-1.8-mmx.patch DELETED ---
10 years, 4 months
rpms/libmpeg3/devel libmpeg3.spec,1.7,1.8
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/libmpeg3/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv22971
Modified Files:
libmpeg3.spec
Log Message:
* Tue Aug 26 2014 Sérgio Basto <sergio(a)serjux.com> - 1.8-6
- add mpeg3protos.h to pkginclude_HEADERS
- use https://github.com/sergiomb2/libmpeg3 with all patches
- spec clean up
Index: libmpeg3.spec
===================================================================
RCS file: /cvs/free/rpms/libmpeg3/devel/libmpeg3.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libmpeg3.spec 26 Aug 2014 00:22:14 -0000 1.7
+++ libmpeg3.spec 26 Aug 2014 00:56:01 -0000 1.8
@@ -1,22 +1,18 @@
Summary: Decoder of various derivatives of MPEG standards
Name: libmpeg3
Version: 1.8
-Release: 5%{?dist}
+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
-Patch1: libmpeg3-1.8-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
-Patch9: libmpeg3-1.7-mpeg2qt-args.patch
-Patch10: libmpeg3-1.8-mmx.patch
+# patch from https://github.com/sergiomb2/libmpeg3
+# date=$(date +%Y%m%d)
+# git clone git@github.com:sergiomb2/libmpeg3.git
+# tag=$(git rev-list HEAD -n 1 | cut -c 1-7)
+# git diff 1.8 . > "$date"_git"$tag".patch
+Patch0: 20140826_git6589c5f.patch
+
#BuildRequires: nasm
BuildRequires: a52dec-devel
BuildRequires: libquicktime-devel
@@ -62,41 +58,8 @@
%prep
%setup -q
-# 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
+%patch0 -p1 -b .github
-# Add ./bootstrap
-%patch6 -p1
-
-# gentoo patches
-%patch7 -p1 -b .gnustack
-
-# Patch the number of arguments of mpeg2qt
-%patch9 -p1 -b .args
-
-# Patch to add mmx possibility via nasm/yasm
-%patch10 -p1 -b .mmx
-
-# Touch docs files:
-touch INSTALL README NEWS AUTHORS ChangeLog
-
-# Build autotools
chmod 755 bootstrap
./bootstrap
@@ -159,6 +122,11 @@
%changelog
+* Tue Aug 26 2014 Sérgio Basto <sergio(a)serjux.com> - 1.8-6
+- add mpeg3protos.h to pkginclude_HEADERS
+- use https://github.com/sergiomb2/libmpeg3 with all patches
+- spec clean up
+
* Sun Mar 03 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.8-5
- Mass rebuilt for Fedora 19 Features
10 years, 4 months
rpms/libmpeg3/devel libmpeg3.spec,1.6,1.7
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/libmpeg3/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12751
Modified Files:
libmpeg3.spec
Log Message:
spec clean up
Index: libmpeg3.spec
===================================================================
RCS file: /cvs/free/rpms/libmpeg3/devel/libmpeg3.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libmpeg3.spec 3 Mar 2013 21:41:15 -0000 1.6
+++ libmpeg3.spec 26 Aug 2014 00:22:14 -0000 1.7
@@ -17,7 +17,6 @@
Patch7: libmpeg3-1.5.2-gnustack.patch
Patch9: libmpeg3-1.7-mpeg2qt-args.patch
Patch10: libmpeg3-1.8-mmx.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
#BuildRequires: nasm
BuildRequires: a52dec-devel
BuildRequires: libquicktime-devel
@@ -124,10 +123,7 @@
make %{?_smp_mflags}
-
%install
-%{__rm} -rf %{buildroot}
-
%{__make} install \
LIBDIR=%{_libdir} \
DESTDIR=%{buildroot} \
@@ -136,10 +132,6 @@
%{__rm} -rf %{buildroot}%{_libdir}/*.la
-%clean
-%{__rm} -rf %{buildroot}
-
-
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
@@ -184,7 +176,7 @@
- Upate to 1.8
- Enable cinelerra-cv hacks
-* Sat Jan 10 2008 kwizart < kwizart at gmail.com > - 1.7-6
+* Sat Jan 12 2008 kwizart < kwizart at gmail.com > - 1.7-6
- Fix mpeg2qt linked with libquicktime
- Disable mmx
10 years, 4 months
rpms/xmms2-nonfree/devel fix_vorbis_dso.patch, NONE, 1.1 xmms2-nonfree.spec, 1.10, 1.11
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xmms2-nonfree/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8371
Modified Files:
xmms2-nonfree.spec
Added Files:
fix_vorbis_dso.patch
Log Message:
* Mon Aug 25 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 0.8-5
- Fix vorbis DSO build failure
fix_vorbis_dso.patch:
wscript | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
--- NEW FILE fix_vorbis_dso.patch ---
--- a/src/clients/vistest/wscript
+++ b/src/clients/vistest/wscript
@@ -23,12 +23,12 @@ def build(bld):
t.install_path = None
- if bld.env.LIB_vorbisenc:
+ if bld.env.LIB_vorbisenc and bld.env.LIB_vorbis and bld.env.LIB_ogg:
t = bld(features = 'c cprogram',
target = 'xmms2-ripper',
source = 'ripper.c',
includes = '. ../../.. ../../include',
- uselib = 'vorbisenc',
+ uselib = 'vorbisenc vorbis ogg',
use = 'xmmsclient'
)
if not bld.env.INSTALL_VIS_REFERENCE_CLIENTS:
@@ -55,6 +55,10 @@ def configure(conf):
conf.check_cfg(package='vorbisenc', uselib_store='vorbisenc',
args='--cflags --libs', mandatory=False)
+ conf.check_cfg(package='vorbis', uselib_store='vorbis',
+ args='--cflags --libs', mandatory=False)
+ conf.check_cfg(package='ogg', uselib_store='ogg',
+ args='--cflags --libs', mandatory=False)
if conf.check_cfg(package='libvisual-0.4', uselib_store='visual',
args='--cflags --libs', mandatory=False):
Index: xmms2-nonfree.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xmms2-nonfree/devel/xmms2-nonfree.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xmms2-nonfree.spec 12 Mar 2013 21:52:03 -0000 1.10
+++ xmms2-nonfree.spec 25 Aug 2014 11:07:00 -0000 1.11
@@ -3,7 +3,7 @@
Name: xmms2-nonfree
Summary: Nonfree plugins for XMMS2
Version: 0.8
-Release: 4%{?dist}
+Release: 5%{?dist}
License: LGPLv2+ and GPLv2+
Group: Applications/Multimedia
# Fedora's xmms2 has to use a sanitized tarball, we don't.
@@ -12,6 +12,7 @@
Patch0: xmms2-0.8DrO_o-use-libdir.patch
# Don't add extra CFLAGS, we're smart enough, thanks.
Patch1: xmms2-0.8DrO_o-no-O0.patch
+Patch2: fix_vorbis_dso.patch
URL: http://wiki.xmms2.xmms.se/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -66,6 +67,7 @@
%patch0 -p1 -b .plugins-use-libdir
%patch1 -p1 -b .noO0
+%patch2 -p1 -b .fix_vorbis_dso
# For some reasons RPMFusion's sidplay libraries are moved to a
# non-standard location. xmms2 can't detect this unless:
@@ -176,6 +178,9 @@
%{_libdir}/xmms2/libxmms_sid.so
%changelog
+* Mon Aug 25 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 0.8-5
+- Fix vorbis DSO build failure
+
* Tue Mar 12 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.8-4
- https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
10 years, 4 months