OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 27-Jun-2006 22:48:54
Branch: HEAD Handle: 2006062721485300
Modified files:
openpkg-src/mplayer mplayer.patch mplayer.spec
Log:
upgrading package: mplayer 1.0pre7 -> 1.0pre8
Summary:
Revision Changes Path
1.16 +39 -38 openpkg-src/mplayer/mplayer.patch
1.145 +8 -9 openpkg-src/mplayer/mplayer.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mplayer/mplayer.patch
============================================================================
$ cvs diff -u -r1.15 -r1.16 mplayer.patch
--- openpkg-src/mplayer/mplayer.patch 19 Jul 2005 08:11:26 -0000 1.15
+++ openpkg-src/mplayer/mplayer.patch 27 Jun 2006 20:48:53 -0000 1.16
@@ -1,29 +1,33 @@
---- loader/Makefile.orig Mon Mar 10 17:21:18 2003
-+++ loader/Makefile Mon Aug 11 11:32:05 2003
-@@ -17,7 +17,7 @@
- # Note: -D_FILE_OFFSET_BITS=32 is required to disable using mmap64(),
- # as it's broken in glibc 2.1.2 (bad header) and 2.1.3 (bad code)
- WARN_FLAGS =
--CFLAGS=-I. -I.. $(OPTFLAGS) -U_FILE_OFFSET_BITS $(EXTRA_INC) $(WARN_FLAGS)
-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer
-+CFLAGS=-I. -I.. $(OPTFLAGS) -U_FILE_OFFSET_BITS $(EXTRA_INC) $(WARN_FLAGS)
-fno-omit-frame-pointer
- #CFLAGS=-I. -I.. -O $(WARN_FLAGS) -g #-fno-omit-frame-pointer
-
- all: libloader.a
Index: libmpcodecs/Makefile
---- libmpcodecs/Makefile.orig 2004-12-29 20:51:56 +0100
-+++ libmpcodecs/Makefile 2005-07-09 09:05:17 +0200
-@@ -21,7 +21,7 @@
+--- libmpcodecs/Makefile.orig 2006-06-11 20:35:41 +0200
++++ libmpcodecs/Makefile 2006-06-27 18:50:08 +0200
+@@ -198,7 +198,7 @@
+ ENCODER_SRCS+=ve_x264.c
+ endif
+
+-NATIVE_SRCS=native/minilzo.c \
++NATIVE_SRCS=\
+ native/nuppelvideo.c \
+ native/RTjpegN.c \
+ native/xa_gsm.c \
+Index: libmpcodecs/native/nuppelvideo.c
+--- libmpcodecs/native/nuppelvideo.c.orig 2006-06-11 20:35:41 +0200
++++ libmpcodecs/native/nuppelvideo.c 2006-06-27 18:48:05 +0200
+@@ -19,7 +19,11 @@
- ENCODER_SRCS=ve.c ve_divx4.c ve_lavc.c ve_vfw.c ve_raw.c ve_libdv.c
ve_xvid.c ve_xvid4.c ve_qtvideo.c ve_nuv.c ve_x264.c
+ #include "libmpdemux/nuppelvideo.h"
+ #include "RTjpegN.h"
++#ifdef USE_LIBLZO
++#include <lzo1x.h>
++#else
+ #include "minilzo.h"
++#endif
--NATIVE_SRCS=native/RTjpegN.c native/minilzo.c native/nuppelvideo.c
native/xa_gsm.c native/decode144.c native/decode288.c
-+NATIVE_SRCS=native/RTjpegN.c native/nuppelvideo.c native/xa_gsm.c
native/decode144.c native/decode288.c
+ #define KEEP_BUFFER
- ifeq ($(FAME),yes)
- VFILTER_SRCS += vf_fame.c
Index: libmpcodecs/vd_lzo.c
---- libmpcodecs/vd_lzo.c.orig 2002-11-07 00:54:24 +0100
-+++ libmpcodecs/vd_lzo.c 2005-07-19 09:33:33 +0200
+--- libmpcodecs/vd_lzo.c.orig 2006-06-11 20:35:41 +0200
++++ libmpcodecs/vd_lzo.c 2006-06-27 18:48:05 +0200
@@ -10,9 +10,9 @@
#include <lzo1x.h>
#else
@@ -35,24 +39,9 @@
#define MOD_NAME "DecLZO"
-Index: libmpcodecs/native/nuppelvideo.c
---- libmpcodecs/native/nuppelvideo.c.orig 2005-03-03 11:19:56 +0100
-+++ libmpcodecs/native/nuppelvideo.c 2005-07-19 09:45:17 +0200
-@@ -19,7 +19,11 @@
-
- #include "libmpdemux/nuppelvideo.h"
- #include "RTjpegN.h"
-+#ifdef USE_LIBLZO
-+#include <lzo1x.h>
-+#else
- #include "minilzo.h"
-+#endif
-
- #define KEEP_BUFFER
-
Index: libmpcodecs/ve_nuv.c
---- libmpcodecs/ve_nuv.c.orig 2005-03-03 11:19:56 +0100
-+++ libmpcodecs/ve_nuv.c 2005-07-19 09:51:16 +0200
+--- libmpcodecs/ve_nuv.c.orig 2006-06-11 20:35:41 +0200
++++ libmpcodecs/ve_nuv.c 2006-06-27 18:48:05 +0200
@@ -19,7 +19,11 @@
#include "vf.h"
@@ -65,3 +54,15 @@
#include "native/RTjpegN.h"
#define LZO_AL(size) (((size) + (sizeof(long) - 1)) / sizeof(long))
+Index: loader/Makefile
+--- loader/Makefile.orig 2006-06-11 20:35:46 +0200
++++ loader/Makefile 2006-06-27 18:48:05 +0200
+@@ -21,7 +21,7 @@
+ # Note: -D_FILE_OFFSET_BITS=32 is required to disable using mmap64(),
+ # as it's broken in glibc 2.1.2 (bad header) and 2.1.3 (bad code)
+ WARN_FLAGS =
+-CFLAGS=-I. -I.. $(OPTFLAGS) -U_FILE_OFFSET_BITS $(EXTRA_INC) $(WARN_FLAGS)
-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer
++CFLAGS=-I. -I.. $(OPTFLAGS) -U_FILE_OFFSET_BITS $(EXTRA_INC) $(WARN_FLAGS)
-fno-omit-frame-pointer
+ #CFLAGS=-I. -I.. -O $(WARN_FLAGS) -g #-fno-omit-frame-pointer
+
+ all: libloader.a
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mplayer/mplayer.spec
============================================================================
$ cvs diff -u -r1.144 -r1.145 mplayer.spec
--- openpkg-src/mplayer/mplayer.spec 8 Jun 2006 18:24:30 -0000 1.144
+++ openpkg-src/mplayer/mplayer.spec 27 Jun 2006 20:48:53 -0000 1.145
@@ -23,11 +23,11 @@
##
# package versions
-%define V_mplayer 1.0pre7
-%define V_codecs_essential 20060501
+%define V_mplayer 1.0pre8
+%define V_codecs_essential 20060611
%define V_codecs_quicktime 20040704
%define V_skin_blue 1.5
-%define V_extension_live 2006.05.17
+%define V_extension_live 2006.06.23
# package information
Name: mplayer
@@ -40,7 +40,7 @@
Group: Video
License: GPL and others
Version: %{V_mplayer}
-Release: 20060608
+Release: 20060627
# build options
%option with_gui yes
@@ -57,7 +57,7 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, X11, gcc, make, sed
+BuildPreReq: OpenPKG, openpkg >= 20040130, X11, gcc3, make, sed
PreReq: OpenPKG, openpkg >= 20040130, X11
BuildPreReq: zlib, libiconv, sdl, freetype, jpeg, png, vorbis-libs, lzo,
libsmbclient, aalib
PreReq: zlib, libiconv, sdl, freetype, jpeg, png, vorbis-libs, lzo,
libsmbclient, aalib
@@ -138,8 +138,8 @@
) || exit $?
# configure programs
- CC="%{l_cc}" \
- CXX="%{l_cxx}" \
+ CC="%{l_prefix}/bin/gcc3" \
+ CXX="%{l_prefix}/bin/g++3" \
CFLAGS="%{l_cflags -O}" \
CXXFLAGS="%{l_cxxflags -O} -Wno-deprecated" \
CPPFLAGS="%{l_cppflags lzo .}" \
@@ -185,8 +185,7 @@
--with-sdl-config=%{l_prefix}/bin/sdl-config \
--with-freetype-config=%{l_prefix}/bin/freetype-config \
--disable-lirc \
- --disable-lircc \
- --disable-i18n
+ --disable-lircc
# fix sloppy library defs for selected platforms
ARCH_LIB=`grep '^ARCH_LIB' config.mak | \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
