[svn] r5060 - in trunk/rpms: dkms-ntfs gstreamer-plugins-bad gxine
madwifi mplayer sdlmame vlc
packagers at lists.rpmforge.net
packagers at lists.rpmforge.net
Tue Jan 9 14:04:01 CET 2007
Author: thias
Date: 2007-01-09 14:03:59 +0100 (Tue, 09 Jan 2007)
New Revision: 5060
Added:
trunk/rpms/madwifi/madwifi-0.9.2.1-noWerr.patch
trunk/rpms/mplayer/MPlayer-1.0rc1-dct64_amd.patch
trunk/rpms/mplayer/asmrules_fix_20061231.diff
trunk/rpms/vlc/vlc-0.8.6a-faad2.patch
Modified:
trunk/rpms/dkms-ntfs/dkms-ntfs.spec
trunk/rpms/gstreamer-plugins-bad/gst-plugins-bad-0.10.3-faad2.patch
trunk/rpms/gstreamer-plugins-bad/gstreamer-plugins-bad.spec
trunk/rpms/gxine/gxine.spec
trunk/rpms/madwifi/madwifi.spec
trunk/rpms/mplayer/mplayer.spec
trunk/rpms/sdlmame/sdlmame.spec
trunk/rpms/vlc/vlc.spec
Log:
Update sdlmame to 0.111, VLC to 0.8.6a, gxine to 0.5.10 and other minor fixes.
Modified: trunk/rpms/dkms-ntfs/dkms-ntfs.spec
===================================================================
--- trunk/rpms/dkms-ntfs/dkms-ntfs.spec 2007-01-09 12:28:38 UTC (rev 5059)
+++ trunk/rpms/dkms-ntfs/dkms-ntfs.spec 2007-01-09 13:03:59 UTC (rev 5060)
@@ -2,12 +2,12 @@
# Authority: matthias
# Dist: nodist
-%define fromkernel 2.6.18
+%define fromkernel 2.6.19.1
Summary: Driver for reading and writing on NTFS formatted volumes
Name: dkms-ntfs
Version: 2.1.27
-Release: 1
+Release: 2
License: GPL
Group: System Environment/Kernel
URL: http://www.linux-ntfs.org/
@@ -15,10 +15,9 @@
# tar cjvf ntfs-%{version}-from-%{fromkernel}.tar.bz2 \
# Documentation/filesystems/ntfs.txt COPYING fs/ntfs/
Source: ntfs-%{version}-from-%{fromkernel}.tar.bz2
-Patch0: ntfs-2.1.27-from-2.6.18-noblksize.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildArch: noarch
-Requires: gcc
+Requires: gcc, make
Requires(post): dkms
Requires(preun): dkms
@@ -28,7 +27,6 @@
%prep
%setup -c
-%patch0 -p0 -b .noblksize
# Move the file to not have it mixed with the sources but included as %doc
%{__mv} fs/ntfs/ChangeLog .
@@ -82,6 +80,10 @@
%changelog
+* Tue Jan 9 2007 Matthias Saou <http://freshrpms.net/> 2.1.27-2
+- Update with module source from 2.6.19.1 to fix build on recent FC6 kernels.
+- Remove now included noblksize patch.
+
* Fri Oct 20 2006 Matthias Saou <http://freshrpms.net/> 2.1.27-1
- Initial RPM release.
- Create source the same way as the rpm.livna.org package does.
Modified: trunk/rpms/gstreamer-plugins-bad/gst-plugins-bad-0.10.3-faad2.patch
===================================================================
--- trunk/rpms/gstreamer-plugins-bad/gst-plugins-bad-0.10.3-faad2.patch 2007-01-09 12:28:38 UTC (rev 5059)
+++ trunk/rpms/gstreamer-plugins-bad/gst-plugins-bad-0.10.3-faad2.patch 2007-01-09 13:03:59 UTC (rev 5060)
@@ -66,3 +66,201 @@
FAAD_LIBS="-lfaad -lm", HAVE_FAAD="no")
if test $HAVE_FAAD = "yes"; then
AC_MSG_CHECKING([Checking for FAAD >= 2])
+diff -Naupr gst-plugins-bad-0.10.3.orig/ext/faad/gstfaad.c gst-plugins-bad-0.10.3/ext/faad/gstfaad.c
+--- gst-plugins-bad-0.10.3.orig/ext/faad/gstfaad.c 2006-05-03 13:10:12.000000000 +0200
++++ gst-plugins-bad-0.10.3/ext/faad/gstfaad.c 2007-01-09 12:36:05.000000000 +0100
+@@ -38,14 +38,14 @@
+ * but not all, hence this Truly Evil Hack. This hack will need updating if
+ * upstream ever releases something with the new API.
+ */
+-#define faacDecInit faacDecInit_no_definition
+-#define faacDecInit2 faacDecInit2_no_definition
++#define NeAACDecInit NeAACDecInit_no_definition
++#define NeAACDecInit2 NeAACDecInit2_no_definition
+ #include "gstfaad.h"
+-#undef faacDecInit
+-#undef faacDecInit2
++#undef NeAACDecInit
++#undef NeAACDecInit2
+
+-extern long faacDecInit (faacDecHandle, guint8 *, guint32, guint32 *, guint8 *);
+-extern int8_t faacDecInit2 (faacDecHandle, guint8 *, guint32,
++extern long NeAACDecInit (NeAACDecHandle, guint8 *, guint32, guint32 *, guint8 *);
++extern int8_t NeAACDecInit2 (NeAACDecHandle, guint8 *, guint32,
+ guint32 *, guint8 *);
+
+ GST_DEBUG_CATEGORY_STATIC (faad_debug);
+@@ -275,10 +275,10 @@ gst_faad_setcaps (GstPad * pad, GstCaps
+ buf = GST_BUFFER (gst_value_get_mini_object (value));
+
+ /* someone forgot that char can be unsigned when writing the API */
+- if ((gint8) faacDecInit2 (faad->handle,
++ if ((gint8) NeAACDecInit2 (faad->handle,
+ GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf), &samplerate,
+ &channels) < 0) {
+- GST_DEBUG ("faacDecInit2() failed");
++ GST_DEBUG ("NeAACDecInit2() failed");
+ return FALSE;
+ }
+
+@@ -666,11 +666,11 @@ gst_faad_srcconnect (GstPad * pad, const
+ }
+
+ if (fmt != -1) {
+- faacDecConfiguration *conf;
++ NeAACDecConfiguration *conf;
+
+- conf = faacDecGetCurrentConfiguration (faad->handle);
++ conf = NeAACDecGetCurrentConfiguration (faad->handle);
+ conf->outputFormat = fmt;
+- if (faacDecSetConfiguration (faad->handle, conf) == 0)
++ if (NeAACDecSetConfiguration (faad->handle, conf) == 0)
+ return GST_PAD_LINK_REFUSED;
+
+ // FIXME: handle return value, how?
+@@ -949,7 +949,7 @@ gst_faad_src_query (GstPad * pad, GstQue
+
+
+ static gboolean
+-gst_faad_update_caps (GstFaad * faad, faacDecFrameInfo * info,
++gst_faad_update_caps (GstFaad * faad, NeAACDecFrameInfo * info,
+ GstCaps ** p_caps)
+ {
+ GstAudioChannelPosition *pos;
+@@ -1086,7 +1086,7 @@ gst_faad_chain (GstPad * pad, GstBuffer
+ GstFaad *faad;
+ GstBuffer *outbuf;
+ GstCaps *caps = NULL;
+- faacDecFrameInfo info;
++ NeAACDecFrameInfo info;
+ void *out;
+ gboolean run_loop = TRUE;
+ guint sync_off;
+@@ -1136,17 +1136,17 @@ gst_faad_chain (GstPad * pad, GstBuffer
+ * appropriate initialisation info... if not, we use our fake_codec_data
+ */
+ if (looks_like_valid_header (input_data, input_size) || !faad->packetised) {
+- if (faacDecInit (faad->handle, input_data, input_size, &rate, &ch) < 0)
++ if (NeAACDecInit (faad->handle, input_data, input_size, &rate, &ch) < 0)
+ goto init_failed;
+
+- GST_DEBUG_OBJECT (faad, "faacDecInit() ok: rate=%u,channels=%u", rate,
++ GST_DEBUG_OBJECT (faad, "NeAACDecInit() ok: rate=%u,channels=%u", rate,
+ ch);
+ } else {
+- if ((gint8) faacDecInit2 (faad->handle, faad->fake_codec_data, 2,
++ if ((gint8) NeAACDecInit2 (faad->handle, faad->fake_codec_data, 2,
+ &rate, &ch) < 0) {
+ goto init2_failed;
+ }
+- GST_DEBUG_OBJECT (faad, "faacDecInit2() ok: rate=%u,channels=%u", rate,
++ GST_DEBUG_OBJECT (faad, "NeAACDecInit2() ok: rate=%u,channels=%u", rate,
+ ch);
+ }
+
+@@ -1179,7 +1179,7 @@ gst_faad_chain (GstPad * pad, GstBuffer
+ }
+ }
+
+- out = faacDecDecode (faad->handle, &info, input_data + skip_bytes,
++ out = NeAACDecDecode (faad->handle, &info, input_data + skip_bytes,
+ input_size - skip_bytes);
+
+ if (info.error) {
+@@ -1189,23 +1189,23 @@ gst_faad_chain (GstPad * pad, GstBuffer
+ if (!faad->packetised)
+ goto decode_error;
+
+- /* decode error? try again using faacDecInit2
++ /* decode error? try again using NeAACDecInit2
+ * fabricated private codec data from sink caps */
+ gst_faad_close_decoder (faad);
+ if (!gst_faad_open_decoder (faad))
+ goto init2_failed;
+
+- GST_DEBUG_OBJECT (faad, "decoding error, reopening with faacDecInit2()");
+- if ((gint8) faacDecInit2 (faad->handle, faad->fake_codec_data, 2,
++ GST_DEBUG_OBJECT (faad, "decoding error, reopening with NeAACDecInit2()");
++ if ((gint8) NeAACDecInit2 (faad->handle, faad->fake_codec_data, 2,
+ &rate, &ch) < 0) {
+ goto init2_failed;
+ }
+
+- GST_DEBUG_OBJECT (faad, "faacDecInit2(): rate=%d,channels=%d", rate, ch);
++ GST_DEBUG_OBJECT (faad, "NeAACDecInit2(): rate=%d,channels=%d", rate, ch);
+
+ /* let's try again */
+ info.error = 0;
+- out = faacDecDecode (faad->handle, &info, input_data + skip_bytes,
++ out = NeAACDecDecode (faad->handle, &info, input_data + skip_bytes,
+ input_size - skip_bytes);
+
+ if (info.error)
+@@ -1311,7 +1311,7 @@ init_failed:
+ init2_failed:
+ {
+ GST_ELEMENT_ERROR (faad, STREAM, DECODE, (NULL),
+- ("%s() failed", (faad->handle) ? "faacDecInit2" : "faacDecOpen"));
++ ("%s() failed", (faad->handle) ? "NeAACDecInit2" : "NeAACDecOpen"));
+ ret = GST_FLOW_ERROR;
+ goto out;
+ }
+@@ -1319,7 +1319,7 @@ init2_failed:
+ decode_error:
+ {
+ GST_ELEMENT_ERROR (faad, STREAM, DECODE, (NULL),
+- ("Failed to decode buffer: %s", faacDecGetErrorMessage (info.error)));
++ ("Failed to decode buffer: %s", NeAACDecGetErrorMessage (info.error)));
+ ret = GST_FLOW_ERROR;
+ goto out;
+ }
+@@ -1328,22 +1328,22 @@ decode_error:
+ static gboolean
+ gst_faad_open_decoder (GstFaad * faad)
+ {
+- faacDecConfiguration *conf;
++ NeAACDecConfiguration *conf;
+
+- faad->handle = faacDecOpen ();
++ faad->handle = NeAACDecOpen ();
+
+ if (faad->handle == NULL) {
+- GST_WARNING_OBJECT (faad, "faacDecOpen() failed");
++ GST_WARNING_OBJECT (faad, "NeAACDecOpen() failed");
+ return FALSE;
+ }
+
+- conf = faacDecGetCurrentConfiguration (faad->handle);
++ conf = NeAACDecGetCurrentConfiguration (faad->handle);
+ conf->defObjectType = LC;
+ /* conf->dontUpSampleImplicitSBR = 1; */
+ conf->outputFormat = FAAD_FMT_16BIT;
+
+- if (faacDecSetConfiguration (faad->handle, conf) == 0) {
+- GST_WARNING_OBJECT (faad, "faacDecSetConfiguration() failed");
++ if (NeAACDecSetConfiguration (faad->handle, conf) == 0) {
++ GST_WARNING_OBJECT (faad, "NeAACDecSetConfiguration() failed");
+ return FALSE;
+ }
+
+@@ -1353,7 +1353,7 @@ gst_faad_open_decoder (GstFaad * faad)
+ static void
+ gst_faad_close_decoder (GstFaad * faad)
+ {
+- faacDecClose (faad->handle);
++ NeAACDecClose (faad->handle);
+ faad->handle = NULL;
+ }
+
+diff -Naupr gst-plugins-bad-0.10.3.orig/ext/faad/gstfaad.h gst-plugins-bad-0.10.3/ext/faad/gstfaad.h
+--- gst-plugins-bad-0.10.3.orig/ext/faad/gstfaad.h 2006-05-02 18:16:31.000000000 +0200
++++ gst-plugins-bad-0.10.3/ext/faad/gstfaad.h 2007-01-09 12:36:34.000000000 +0100
+@@ -51,7 +51,7 @@ typedef struct _GstFaad {
+ GstBuffer *tempbuf; /* used to keep input leftovers */
+
+ /* FAAD object */
+- faacDecHandle handle;
++ NeAACDecHandle handle;
+ gboolean init;
+
+ /* FAAD channel setup */
Modified: trunk/rpms/gstreamer-plugins-bad/gstreamer-plugins-bad.spec
===================================================================
--- trunk/rpms/gstreamer-plugins-bad/gstreamer-plugins-bad.spec 2007-01-09 12:28:38 UTC (rev 5059)
+++ trunk/rpms/gstreamer-plugins-bad/gstreamer-plugins-bad.spec 2007-01-09 13:03:59 UTC (rev 5060)
@@ -13,7 +13,7 @@
Summary: GStreamer streaming media framework "bad" plug-ins
Name: %{gstreamer}-plugins-bad
Version: 0.10.3
-Release: 2
+Release: 3
License: LGPL
Group: Applications/Multimedia
URL: http://gstreamer.freedesktop.org/
@@ -138,6 +138,9 @@
%changelog
+* Tue Jan 9 2007 Matthias Saou <http://freshrpms.net/> 0.10.3-3
+- Update faad2 patch to also update the plugin sources, not just configure.
+
* Mon Dec 18 2006 Matthias Saou <http://freshrpms.net/> 0.10.3-2
- Try to rebuild against new wavpack 4.40 from Extras : Fails.
- Try to update to 0.10.3.2 pre-release : Fails, it needs a more recent gst.
Modified: trunk/rpms/gxine/gxine.spec
===================================================================
--- trunk/rpms/gxine/gxine.spec 2007-01-09 12:28:38 UTC (rev 5059)
+++ trunk/rpms/gxine/gxine.spec 2007-01-09 13:03:59 UTC (rev 5060)
@@ -26,7 +26,7 @@
Summary: Frontend for the xine multimedia library
Name: gxine
-Version: 0.5.9
+Version: 0.5.10
Release: 1
License: GPL
Group: Applications/Multimedia
@@ -127,6 +127,9 @@
%{_datadir}/icons/*/*/apps/gxine.png
%changelog
+* Tue Jan 9 2007 Matthias Saou <http://freshrpms.net/> 0.5.10-1
+- Update to 0.5.10.
+
* Mon Dec 18 2006 Matthias Saou <http://freshrpms.net/> 0.5.9-1
- Update to 0.5.9.
Added: trunk/rpms/madwifi/madwifi-0.9.2.1-noWerr.patch
===================================================================
--- trunk/rpms/madwifi/madwifi-0.9.2.1-noWerr.patch (rev 0)
+++ trunk/rpms/madwifi/madwifi-0.9.2.1-noWerr.patch 2007-01-09 13:03:59 UTC (rev 5060)
@@ -0,0 +1,11 @@
+diff -Naupr madwifi-0.9.2.1.orig/Makefile.inc madwifi-0.9.2.1/Makefile.inc
+--- madwifi-0.9.2.1.orig/Makefile.inc 2006-07-14 07:15:56.000000000 +0200
++++ madwifi-0.9.2.1/Makefile.inc 2007-01-09 10:42:49.000000000 +0100
+@@ -181,7 +181,6 @@ endif
+ #
+ TOOLS= $(DEPTH)/tools
+
+-COPTS+= -Werror
+ INCS= -include $(obj)/$(DEPTH)/include/compat.h -I$(obj)/$(DEPTH)/include
+
+ ifeq ($(strip $(BUS)),AHB)
Modified: trunk/rpms/madwifi/madwifi.spec
===================================================================
--- trunk/rpms/madwifi/madwifi.spec 2007-01-09 12:28:38 UTC (rev 5059)
+++ trunk/rpms/madwifi/madwifi.spec 2007-01-09 13:03:59 UTC (rev 5060)
@@ -4,14 +4,15 @@
Summary: Multiband Atheros Driver for Wireless Fidelity
Name: madwifi
Version: 0.9.2.1
-Release: 1
+Release: 2
License: GPL
Group: System Environment/Kernel
URL: http://madwifi.org/
Source: http://dl.sf.net/sourceforge/madwifi/madwifi-%{version}.tar.bz2
Patch0: madwifi-2.6.18-config.patch
+Patch1: madwifi-0.9.2.1-noWerr.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: gcc
+Requires: gcc, make
Requires(post): dkms
Requires(preun): dkms
Provides: dkms-madwifi = %{version}-%{release}
@@ -28,6 +29,7 @@
%prep
%setup
%patch0 -p1 -b .config
+%patch1 -p1 -b .noWerr
%build
@@ -125,6 +127,9 @@
%changelog
+* Tue Jan 9 2007 Matthias Saou <http://freshrpms.net/> 0.9.2.1-2
+- Add patch to remove -Werr since warnings are printed with recent FC6 kernels.
+
* Mon Dec 11 2006 Matthias Saou <http://freshrpms.net/> 0.9.2.1-1
- Update to 0.9.2.1 security fix release.
Added: trunk/rpms/mplayer/MPlayer-1.0rc1-dct64_amd.patch
===================================================================
--- trunk/rpms/mplayer/MPlayer-1.0rc1-dct64_amd.patch (rev 0)
+++ trunk/rpms/mplayer/MPlayer-1.0rc1-dct64_amd.patch 2007-01-09 13:03:59 UTC (rev 5060)
@@ -0,0 +1,40 @@
+diff -Naupr MPlayer-1.0rc1.orig/mp3lib/dct64_3dnow.c MPlayer-1.0rc1/mp3lib/dct64_3dnow.c
+--- MPlayer-1.0rc1.orig/mp3lib/dct64_3dnow.c 2006-10-23 00:32:26.000000000 +0200
++++ MPlayer-1.0rc1/mp3lib/dct64_3dnow.c 2007-01-09 11:04:53.000000000 +0100
+@@ -617,6 +617,8 @@ void dct64_MMX_3dnow(real *a,real *b,rea
+ " punpckldq %%mm1, %%mm0\n\t"
+ " movq %%mm0, 116(%%edx)\n\t"
+
++// this code is broken, there is nothing modifying the z flag above.
++#if 0
+ " jnz .L01\n\t"
+
+ /* Phase 7*/
+@@ -738,6 +740,7 @@ void dct64_MMX_3dnow(real *a,real *b,rea
+
+ " jmp .L_bye\n\t"
+ ".L01:\n\t"
++#endif
+ /* Phase 9*/
+
+ " movq (%%ecx), %%mm0\n\t"
+diff -Naupr MPlayer-1.0rc1.orig/mp3lib/dct64_k7.c MPlayer-1.0rc1/mp3lib/dct64_k7.c
+--- MPlayer-1.0rc1.orig/mp3lib/dct64_k7.c 2006-10-23 00:32:26.000000000 +0200
++++ MPlayer-1.0rc1/mp3lib/dct64_k7.c 2007-01-09 11:04:57.000000000 +0100
+@@ -463,6 +463,8 @@ void dct64_MMX_3dnowex(real *a,real *b,r
+ " punpckldq %%mm1, %%mm0\n\t"
+ " movq %%mm0, 116(%%edx)\n\t"
+
++// this code is broken, there is nothing modifying the z flag above.
++#if 0
+ " jnz .L01\n\t"
+
+ /* Phase 7*/
+@@ -584,6 +586,7 @@ void dct64_MMX_3dnowex(real *a,real *b,r
+
+ " jmp .L_bye\n\t"
+ ".L01: \n\t"
++#endif
+ /* Phase 9*/
+
+ " movq (%%ecx), %%mm0\n\t"
Added: trunk/rpms/mplayer/asmrules_fix_20061231.diff
===================================================================
--- trunk/rpms/mplayer/asmrules_fix_20061231.diff (rev 0)
+++ trunk/rpms/mplayer/asmrules_fix_20061231.diff 2007-01-09 13:03:59 UTC (rev 5060)
@@ -0,0 +1,51 @@
+Index: stream/realrtsp/asmrp.c
+===================================================================
+--- stream/realrtsp/asmrp.c (revision 20381)
++++ stream/realrtsp/asmrp.c (working copy)
+@@ -40,6 +40,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
++#include "asmrp.h"
+
+ /*
+ #define LOG
+@@ -645,8 +646,10 @@
+ #ifdef LOG
+ printf ("rule #%d is true\n", rule_num);
+ #endif
+- matches[num_matches] = rule_num;
+- num_matches++;
++ if(num_matches < MAX_RULEMATCHES - 1)
++ matches[num_matches++] = rule_num;
++ else
++ printf("Ignoring matched asm rule %d, too many matched rules.\n", rule_num);
+ }
+
+ rule_num++;
+Index: stream/realrtsp/real.c
+===================================================================
+--- stream/realrtsp/real.c (revision 20381)
++++ stream/realrtsp/real.c (working copy)
+@@ -271,7 +271,7 @@
+ int j=0;
+ int n;
+ char b[64];
+- int rulematches[16];
++ int rulematches[MAX_RULEMATCHES];
+
+ #ifdef LOG
+ printf("calling asmrp_match with:\n%s\n%u\n", desc->stream[i]->asm_rule_book, bandwidth);
+Index: stream/realrtsp/asmrp.h
+===================================================================
+--- stream/realrtsp/asmrp.h (revision 20381)
++++ stream/realrtsp/asmrp.h (working copy)
+@@ -40,6 +40,8 @@
+ #ifndef HAVE_ASMRP_H
+ #define HAVE_ASMRP_H
+
++#define MAX_RULEMATCHES 16
++
+ int asmrp_match (const char *rules, int bandwidth, int *matches) ;
+
+ #endif
Modified: trunk/rpms/mplayer/mplayer.spec
===================================================================
--- trunk/rpms/mplayer/mplayer.spec 2007-01-09 12:28:38 UTC (rev 5059)
+++ trunk/rpms/mplayer/mplayer.spec 2007-01-09 13:03:59 UTC (rev 5060)
@@ -67,7 +67,7 @@
Summary: MPlayer, the Movie Player for Linux
Name: mplayer
Version: 1.0
-Release: 0.33%{?rcver:.%{rcver}}%{?date:.%{date}}
+Release: 0.34%{?rcver:.%{rcver}}%{?date:.%{date}}try2
License: GPL
Group: Applications/Multimedia
URL: http://mplayerhq.hu/
@@ -89,6 +89,9 @@
Patch1: MPlayer-0.90-playlist.patch
Patch2: MPlayer-0.90pre10-redhat.patch
Patch10: MPlayer-1.0pre6a-fribidi.patch
+# Fixes to 1.0rc1 which won't be needed anymore with 1.0rc2
+Patch50: MPlayer-1.0rc1-dct64_amd.patch
+Patch51: asmrules_fix_20061231.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: mplayer-fonts
BuildRequires: gtk2-devel, SDL-devel
@@ -174,6 +177,8 @@
%patch1 -p1 -b .playlist
%patch2 -p0 -b .redhat
%patch10 -p1 -b .fribidi
+%patch50 -p1 -b .dct64_amd
+%patch51 -p0 -b .asmrules_fix
# Overwrite some of the details of the provided system menu entry
%{__perl} -pi -e 's|^Exec=gmplayer$|Exec=gmplayer %f|g;
@@ -310,6 +315,10 @@
%changelog
+* Tue Jan 9 2007 Matthias Saou <http://freshrpms.net/> 1.0-0.34.rc1try2
+- Include patch to fix mp3 playback on AMD CPUs.
+- Include patch to fix buffer overflow in asmrp.c.
+
* Tue Oct 24 2006 Matthias Saou <http://freshrpms.net/> 1.0-0.33.rc1
- Update to 1.0rc1.
- Update live library to 2006.10.18a.
Modified: trunk/rpms/sdlmame/sdlmame.spec
===================================================================
--- trunk/rpms/sdlmame/sdlmame.spec 2007-01-09 12:28:38 UTC (rev 5059)
+++ trunk/rpms/sdlmame/sdlmame.spec 2007-01-09 13:03:59 UTC (rev 5060)
@@ -1,7 +1,7 @@
# $Id$
# Authority: matthias
-%define mamever 110
+%define mamever 111
Summary: SDL port of the Multi Arcade Machine Emulator (MAME)
Name: sdlmame
@@ -75,6 +75,9 @@
%changelog
+* Thu Dec 21 2006 Matthias Saou <http://freshrpms.net/> 0.111-1
+- Update to 0.111.
+
* Wed Nov 8 2006 Matthias Saou <http://freshrpms.net/> 0.110-1
- Update to 0.110.
- Add new libXinerama-devel build requirement.
Added: trunk/rpms/vlc/vlc-0.8.6a-faad2.patch
===================================================================
--- trunk/rpms/vlc/vlc-0.8.6a-faad2.patch (rev 0)
+++ trunk/rpms/vlc/vlc-0.8.6a-faad2.patch 2007-01-09 13:03:59 UTC (rev 5060)
@@ -0,0 +1,101 @@
+diff -Naupr vlc-0.8.6a.orig/modules/codec/faad.c vlc-0.8.6a/modules/codec/faad.c
+--- vlc-0.8.6a.orig/modules/codec/faad.c 2007-01-03 19:27:59.000000000 +0100
++++ vlc-0.8.6a/modules/codec/faad.c 2007-01-08 19:52:35.000000000 +0100
+@@ -55,7 +55,7 @@ static void DoReordering( decoder_t *, u
+ struct decoder_sys_t
+ {
+ /* faad handler */
+- faacDecHandle *hfaad;
++ NeAACDecHandle *hfaad;
+
+ /* samples */
+ audio_date_t date;
+@@ -95,7 +95,7 @@ static int Open( vlc_object_t *p_this )
+ {
+ decoder_t *p_dec = (decoder_t*)p_this;
+ decoder_sys_t *p_sys = p_dec->p_sys;
+- faacDecConfiguration *cfg;
++ NeAACDecConfiguration *cfg;
+
+ if( p_dec->fmt_in.i_codec != VLC_FOURCC('m','p','4','a') )
+ {
+@@ -111,7 +111,7 @@ static int Open( vlc_object_t *p_this )
+ }
+
+ /* Open a faad context */
+- if( ( p_sys->hfaad = faacDecOpen() ) == NULL )
++ if( ( p_sys->hfaad = NeAACDecOpen() ) == NULL )
+ {
+ msg_Err( p_dec, "cannot initialize faad" );
+ return VLC_EGENERIC;
+@@ -136,7 +136,7 @@ static int Open( vlc_object_t *p_this )
+ unsigned long i_rate;
+ unsigned char i_channels;
+
+- if( faacDecInit2( p_sys->hfaad, p_dec->fmt_in.p_extra,
++ if( NeAACDecInit2( p_sys->hfaad, p_dec->fmt_in.p_extra,
+ p_dec->fmt_in.i_extra,
+ &i_rate, &i_channels ) < 0 )
+ {
+@@ -155,12 +155,12 @@ static int Open( vlc_object_t *p_this )
+ }
+
+ /* Set the faad config */
+- cfg = faacDecGetCurrentConfiguration( p_sys->hfaad );
++ cfg = NeAACDecGetCurrentConfiguration( p_sys->hfaad );
+ if (p_this->p_libvlc->i_cpu & CPU_CAPABILITY_FPU)
+ cfg->outputFormat = FAAD_FMT_FLOAT;
+ else
+ cfg->outputFormat = FAAD_FMT_16BIT;
+- faacDecSetConfiguration( p_sys->hfaad, cfg );
++ NeAACDecSetConfiguration( p_sys->hfaad, cfg );
+
+ /* buffer */
+ p_sys->i_buffer = p_sys->i_buffer_size = 0;
+@@ -212,7 +212,7 @@ static aout_buffer_t *DecodeBlock( decod
+ unsigned long i_rate;
+ unsigned char i_channels;
+
+- if( faacDecInit2( p_sys->hfaad, p_dec->fmt_in.p_extra,
++ if( NeAACDecInit2( p_sys->hfaad, p_dec->fmt_in.p_extra,
+ p_dec->fmt_in.i_extra,
+ &i_rate, &i_channels ) >= 0 )
+ {
+@@ -228,7 +228,7 @@ static aout_buffer_t *DecodeBlock( decod
+ unsigned char i_channels;
+
+ /* Init faad with the first frame */
+- if( faacDecInit( p_sys->hfaad,
++ if( NeAACDecInit( p_sys->hfaad,
+ p_sys->p_buffer, p_sys->i_buffer,
+ &i_rate, &i_channels ) < 0 )
+ {
+@@ -257,16 +257,16 @@ static aout_buffer_t *DecodeBlock( decod
+ if( p_sys->i_buffer )
+ {
+ void *samples;
+- faacDecFrameInfo frame;
++ NeAACDecFrameInfo frame;
+ aout_buffer_t *p_out;
+ int i, j;
+
+- samples = faacDecDecode( p_sys->hfaad, &frame,
++ samples = NeAACDecDecode( p_sys->hfaad, &frame,
+ p_sys->p_buffer, p_sys->i_buffer );
+
+ if( frame.error > 0 )
+ {
+- msg_Warn( p_dec, "%s", faacDecGetErrorMessage( frame.error ) );
++ msg_Warn( p_dec, "%s", NeAACDecGetErrorMessage( frame.error ) );
+
+ /* Flush the buffer */
+ p_sys->i_buffer = 0;
+@@ -403,7 +403,7 @@ static void Close( vlc_object_t *p_this
+ decoder_t *p_dec = (decoder_t *)p_this;
+ decoder_sys_t *p_sys = p_dec->p_sys;
+
+- faacDecClose( p_sys->hfaad );
++ NeAACDecClose( p_sys->hfaad );
+ if( p_sys->p_buffer ) free( p_sys->p_buffer );
+ free( p_sys );
+ }
Modified: trunk/rpms/vlc/vlc.spec
===================================================================
--- trunk/rpms/vlc/vlc.spec 2007-01-09 12:28:38 UTC (rev 5059)
+++ trunk/rpms/vlc/vlc.spec 2007-01-09 13:03:59 UTC (rev 5060)
@@ -94,8 +94,8 @@
Summary: The VideoLAN client, also a very good standalone video player
Name: vlc
-Version: 0.8.6
-Release: 2
+Version: 0.8.6a
+Release: 1
License: GPL
Group: Applications/Multimedia
URL: http://www.videolan.org/
@@ -104,6 +104,7 @@
Source2: http://www.live555.com/liveMedia/public/live.%{live_date}.tar.gz
Patch0: vlc-0.8.6-ffmpegX11.patch
Patch1: vlc-0.8.6-wx28.patch
+Patch2: vlc-0.8.6a-faad2.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: gcc-c++, libpng-devel, libxml2-devel, libtiff-devel
BuildRequires: libgcrypt-devel, gnutls-devel, libtar-devel
@@ -199,6 +200,7 @@
%setup -a 1 -a 2
%patch0 -p1 -b .ffmpegX11
%patch1 -p1 -b .wx28
+%patch2 -p1 -b .faad2
# Fix PLUGIN_PATH path for lib64
%{__perl} -pi -e 's|/lib/vlc|/%{_lib}/vlc|g' vlc-config.in.in configure*
@@ -320,6 +322,10 @@
%changelog
+* Mon Jan 8 2007 Matthias Saou <http://freshrpms.net/> 0.8.6a-1
+- Update to 0.8.6a.
+- Add faad2 patch.
+
* Mon Jan 8 2007 Matthias Saou <http://freshrpms.net/> 0.8.6-2
- Add patch to fix wxGTK 2.8 build (FC devel).
- Revert many useless changes to the ffmpeg compilation since we use it as
More information about the svn-commits
mailing list