[svn] r6088 - in trunk/rpms: fuse-encfs xine-lib

[packagers at lists.rpmforge.net]

Author: dag
Date: 2008-01-08 04:49:33 +0100 (Tue, 08 Jan 2008)
New Revision: 6088

Added:
   trunk/rpms/xine-lib/xine-lib-1.1.9-speex104.patch
Modified:
   trunk/rpms/fuse-encfs/fuse-encfs.spec
   trunk/rpms/xine-lib/xine-lib.spec
Log:
Updates

Modified: trunk/rpms/fuse-encfs/fuse-encfs.spec
===================================================================
--- trunk/rpms/fuse-encfs/fuse-encfs.spec	2008-01-08 02:36:03 UTC (rev 6087)
+++ trunk/rpms/fuse-encfs/fuse-encfs.spec	2008-01-08 03:49:33 UTC (rev 6088)
@@ -15,6 +15,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: openssl-devel, fuse-devel >= 2.2, rlog-devel >= 1.3
+BuildRequires: boost-devel
 Requires: fuse >= 2.2
 
 Obsoletes: encfs <= %{name}-%{version}
@@ -34,15 +35,11 @@
 %configure \
     --disable-static
 %{__make} %{?_smp_mflags}
-### Make sure we install translations on EL5/x86_64 (bug in 1.4.0)
-%{__make} %{?_smp_mflags} -C po
 
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR="%{buildroot}"
-### Make sure we install translations on EL5/x86_64 (bug in 1.4.0)
-%{__make} install DESTDIR="%{buildroot}" -C po
-%find_lang %{real_name}
+#find_lang %{real_name}
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -50,7 +47,8 @@
 %clean
 %{__rm} -rf %{buildroot}
 
-%files -f %{real_name}.lang
+#files -f %{real_name}.lang
+%files
 %defattr(-, root, root, 0755)
 %doc AUTHORS ChangeLog COPYING README
 %doc %{_mandir}/man1/encfs.1*

Added: trunk/rpms/xine-lib/xine-lib-1.1.9-speex104.patch
===================================================================
--- trunk/rpms/xine-lib/xine-lib-1.1.9-speex104.patch	                        (rev 0)
+++ trunk/rpms/xine-lib/xine-lib-1.1.9-speex104.patch	2008-01-08 03:49:33 UTC (rev 6088)
@@ -0,0 +1,20 @@
+--- src/libxineadec/xine_speex_decoder.c.orig	2008-01-01 14:30:08.000000000 +0100
++++ src/libxineadec/xine_speex_decoder.c	2008-01-08 04:32:38.278585872 +0100
+@@ -293,7 +293,7 @@
+       int ret;
+       int bitrate;
+ 
+-      ret = speex_decode_int (this->st, &this->bits, audio_buffer->mem);
++      ret = speex_decode (this->st, &this->bits, audio_buffer->mem);
+ 
+       if (ret==-1)
+ 	break;
+@@ -307,7 +307,7 @@
+       }
+ 
+       if (this->channels == 2) {
+-	speex_decode_stereo_int (audio_buffer->mem, this->frame_size, &this->stereo);
++	speex_decode_stereo (audio_buffer->mem, this->frame_size, &this->stereo);
+       }
+ 
+       speex_decoder_ctl (this->st, SPEEX_GET_BITRATE, &bitrate);

Modified: trunk/rpms/xine-lib/xine-lib.spec
===================================================================
--- trunk/rpms/xine-lib/xine-lib.spec	2008-01-08 02:36:03 UTC (rev 6087)
+++ trunk/rpms/xine-lib/xine-lib.spec	2008-01-08 03:49:33 UTC (rev 6088)
@@ -10,6 +10,8 @@
 %{?fc6:  %define _with_modxorg 1}
 %{?fc5:  %define _with_modxorg 1}
 
+%{?el4:%define _with_speex104 1}
+
 %{?fc2:%define _without_gettextdevel 1}
 
 %{?fc1:%define _without_alsa 1}
@@ -64,9 +66,9 @@
 URL: http://xinehq.de/
 
 Source: http://downloads.sf.net/xine/xine-lib-%{version}.tar.bz2
+Patch0: xine-lib-1.1.9-speex104.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-Requires: libdvdcss
 BuildRequires: gcc-c++, pkgconfig, zlib-devel, libtiff-devel
 BuildRequires: libvorbis-devel, SDL-devel, bzip2-devel
 # BUG : libmng-devel should apparently require libjpeg-devel for includes
@@ -103,6 +105,7 @@
 %{?fc2:BuildRequires: freeglut-devel}
 %{?fc1:BuildRequires: freeglut-devel}
 %{?rh9:BuildRequires: glut-devel}
+Requires: libdvdcss
 Obsoletes: xine-libs <= 1.0.0
 Obsoletes: libxine <= %{version}-%{release}
 Obsoletes: xine-libs-moles <= %{version}-%{release}
@@ -145,6 +148,9 @@
 
 %prep
 %setup
+
+%{?_with_speex104:%patch0 -p0}
+
 %{__perl} -pi -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
 
 %build