[rpms/xine-lib] epel9-next: * Wed Feb 24 2010 Rex Dieter <rdieter@fedoraproject.org> - 1.1.18-1

[rpms/xine-lib] epel9-next: * Wed Feb 24 2010 Rex Dieter <rdieter@fedoraproject.org> - 1.1.18-1

[Rex Dieter]

            A new commit has been pushed.

            Repo   : rpms/xine-lib
            Branch : epel9-next
            Commit : 3cc315a82c6c6cf83ae38cc8dcf352bd5cbb5a8e
            Author : Rex Dieter <rdieter@fedoraproject.org>
            Date   : 2010-02-24T15:07:47+00:00
            Stats  : +42/-47 in 6 file(s)
            URL    : https://src.fedoraproject.org/rpms/xine-lib/c/3cc315a82c6c6cf83ae38cc8dcf352bd5cbb5a8e?branch=epel9-next

            Log:
            * Wed Feb 24 2010 Rex Dieter <rdieter@fedoraproject.org> - 1.1.18-1
- xine-lib-1.1.18, plugin-abi 1.28 (#567913)

---
diff --git a/.cvsignore b/.cvsignore
index 8f16768..07a7912 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -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

diff --git a/sources b/sources
index b24e568..53206ac 100644
--- a/sources
+++ b/sources
@@ -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

diff --git a/xine-lib-1.1.17-flac_priority.patch b/xine-lib-1.1.17-flac_priority.patch
deleted file mode 100644
index 68aae11..0000000
--- a/xine-lib-1.1.17-flac_priority.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up xine-lib-1.1.17/src/combined/decoder_flac.c.flac_priority xine-lib-1.1.17/src/combined/decoder_flac.c
---- xine-lib-1.1.17/src/combined/decoder_flac.c.flac_priority	2009-11-30 14:55:46.000000000 -0600
-+++ xine-lib-1.1.17/src/combined/decoder_flac.c	2009-12-12 21:34:19.095500951 -0600
-@@ -426,7 +426,7 @@ static uint32_t audio_types[] = {
- 
- static const decoder_info_t dec_info_audio = {
-   audio_types,         /* supported types */
--  5                    /* priority        */
-+  8                    /* priority        */
- };
- 
- const plugin_info_t xine_plugin_info[] EXPORTED = {

diff --git a/xine-lib-1.1.17-no_autopoint.patch b/xine-lib-1.1.17-no_autopoint.patch
deleted file mode 100644
index d5ee0cd..0000000
--- a/xine-lib-1.1.17-no_autopoint.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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"
- 

diff --git a/xine-lib-1.1.18-no_autopoint.patch b/xine-lib-1.1.18-no_autopoint.patch
new file mode 100644
index 0000000..d5ee0cd
--- /dev/null
+++ b/xine-lib-1.1.18-no_autopoint.patch
@@ -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"
+ 

diff --git a/xine-lib.spec b/xine-lib.spec
index 5ed9d31..895b2d3 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -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}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 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/optimizations.m4
 #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)" SDL_LIBS="$(sdl-config --libs)"
 %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@fedoraproject.org> - 1.1.18-1
+- xine-lib-1.1.18, plugin-abi 1.28 (#567913)
+
 * Sat Dec 12 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.1.17-3
 - bump flac_decoder priority (rh#301861,xine#225)