rpms/xine-lib/F-13 xine-lib-1.1.18-no_autopoint.patch, NONE, 1.1 .cvsignore, 1.22, 1.23 sources, 1.24, 1.25 xine-lib.spec, 1.82, 1.83 xine-lib-1.1.17-flac_priority.patch, 1.1, NONE xine-lib-1.1.17-no_autopoint.patch, 1.1, NONE
Rex Dieter
rdieter at fedoraproject.org
Thu Feb 25 03:39:49 UTC 2010
Author: rdieter
Update of /cvs/pkgs/rpms/xine-lib/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27294
Modified Files:
.cvsignore sources xine-lib.spec
Added Files:
xine-lib-1.1.18-no_autopoint.patch
Removed Files:
xine-lib-1.1.17-flac_priority.patch
xine-lib-1.1.17-no_autopoint.patch
Log Message:
* Wed Feb 24 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.1.18-1
- xine-lib-1.1.18, plugin-abi 1.28 (#567913)
xine-lib-1.1.18-no_autopoint.patch:
autogen.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE xine-lib-1.1.18-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"
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-13/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore 2 Dec 2009 18:27:27 -0000 1.22
+++ .cvsignore 25 Feb 2010 03:39:49 -0000 1.23
@@ -1,2 +1,2 @@
-xine-lib-1.1.17-pruned.tar.bz2
-xine-lib-1.1.17-autotools.patch.bz2
+xine-lib-1.1.18-pruned.tar.bz2
+xine-lib-1.1.18-autotools.patch.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-13/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources 2 Dec 2009 18:27:27 -0000 1.24
+++ sources 25 Feb 2010 03:39:49 -0000 1.25
@@ -1,2 +1,2 @@
-4c2655e0c12520b1e6e78a72d59a62ce xine-lib-1.1.17-pruned.tar.bz2
-f4282ee36447d94765d89d06787012be xine-lib-1.1.17-autotools.patch.bz2
+8e93ff9da4839042680c8118f1c4cd3f xine-lib-1.1.18-pruned.tar.bz2
+2b8c6d3188a180fa763a44bb2ca9fe4c xine-lib-1.1.18-autotools.patch.bz2
Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-13/xine-lib.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- xine-lib.spec 14 Dec 2009 16:09:13 -0000 1.82
+++ xine-lib.spec 25 Feb 2010 03:39:49 -0000 1.83
@@ -3,7 +3,7 @@
# - drop the opengl video out plugin?
# - deprecate ESD support?
-%define plugin_abi 1.27
+%define plugin_abi 1.28
%define codecdir %{_libdir}/codecs
%ifarch %{ix86}
@@ -13,13 +13,15 @@
%endif # ix86
%if 0%{?fedora}
- %define with_aalib %{?_without_aalib:0}%{!?_without_aalib:1}
- %define with_pa %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1}
- %define with_xcb %{?_without_xcb:0}%{!?_without_xcb:1}
+%define _enable_v4l --enable-v4l --enable-libv4l
+%define _disable_gnomevfs --disable-gnomevfs
+%define with_aalib %{?_without_aalib:0}%{!?_without_aalib:1}
+%define with_pa %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1}
+%define with_xcb %{?_without_xcb:0}%{!?_without_xcb:1}
%else
- %define with_aalib %{?_with_aalib:1}%{!?_with_aalib:0}
- %define with_pa %{?_with_pulseaudio:1}%{!?_with_pulseaudio:0}
- %define with_xcb %{?_with_xcb:1}%{!?_with_xcb:0}
+%define with_aalib %{?_with_aalib:1}%{!?_with_aalib:0}
+%define with_pa %{?_with_pulseaudio:1}%{!?_with_pulseaudio:0}
+%define with_xcb %{?_with_xcb:1}%{!?_with_xcb:0}
%endif # Fedora
%if 0%{?fedora} > 8 || 0%{?rhel} > 5
@@ -32,8 +34,8 @@
Summary: A multimedia engine
Name: xine-lib
-Version: 1.1.17
-Release: 3%{?dist}
+Version: 1.1.18
+Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://www.xine-project.org/
@@ -49,16 +51,13 @@ BuildRoot: %{_tmppath}/%{name}-%{ve
Patch1: xine-lib-1.1.4-optflags.patch
# used to help
-Patch2: xine-lib-1.1.17-no_autopoint.patch
+Patch2: xine-lib-1.1.18-no_autopoint.patch
Patch6: xine-lib-1.1.1-deepbind-939.patch
# http://bugzilla.redhat.com/470568
Patch8: xine-lib-1.1.17-avsync_hack.patch
# http://bugzilla.redhat.com/477226
Patch9: xine-lib-1.1.16.2-multilib.patch
## upstreamable patches
-# https://bugzilla.redhat.com/show_bug.cgi?id=301861
-# http://bugs.xine-project.org/show_bug.cgi?id=225
-Patch50: xine-lib-1.1.17-flac_priority.patch
## upstream patches
Provides: xine-lib(plugin-abi) = %{plugin_abi}
@@ -71,6 +70,9 @@ BuildRequires: libXv-devel
BuildRequires: libXinerama-devel
BuildRequires: libXvMC-devel
BuildRequires: libGLU-devel
+%if 0%{?_enable_v4l:1}
+BuildRequires: libv4l-devel
+%endif
%if %{with_xcb}
BuildRequires: libxcb-devel
%endif # xcb
@@ -193,7 +195,6 @@ touch -r m4/optimizations.m4.stamp m4/op
#patch6 -p1 -b .deepbind
%patch8 -p1 -b .avsync_hack
%patch9 -p1 -b .multilib
-%patch50 -p1 -b .flac_priority
# autotools patch + touch'ing above seems to miss something, aclocal
# runs on make anyway, let's use the ./autogen.sh hammer for now.
@@ -215,6 +216,8 @@ export SDL_CFLAGS="$(sdl-config --cflags
%if 0%{!?_without_directfb:1}
--enable-directfb \
%endif # directfb
+ %{?_enable_v4l}%{!?_enable_v4l:--disable-v4l --disable-libv4l} \
+ %{?_disable_gnomevfs} \
--disable-a52dec \
--disable-mad \
--disable-vcd \
@@ -366,6 +369,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_rtsp.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_stdin_fifo.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_v4l.so
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_v4l2.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_fb.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_none.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_opengl.so
@@ -433,6 +437,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Feb 24 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.1.18-1
+- xine-lib-1.1.18, plugin-abi 1.28 (#567913)
+
* Sat Dec 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.17-3
- bump flac_decoder priority (rh#301861,xine#225)
--- xine-lib-1.1.17-flac_priority.patch DELETED ---
--- xine-lib-1.1.17-no_autopoint.patch DELETED ---
More information about the scm-commits
mailing list