OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 06-Sep-2003 17:41:33
Branch: HEAD Handle: 2003090616413201
Modified files:
openpkg-src/mplayer mplayer.patch mplayer.spec
openpkg-web news.txt
Log:
Consolidate patch, and fix newly introduced FAAD library version
problem (in configuration)
Summary:
Revision Changes Path
1.4 +0 -194 openpkg-src/mplayer/mplayer.patch
1.26 +41 -4 openpkg-src/mplayer/mplayer.spec
1.6432 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mplayer/mplayer.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 mplayer.patch
--- openpkg-src/mplayer/mplayer.patch 30 Aug 2003 12:48:01 -0000 1.3
+++ openpkg-src/mplayer/mplayer.patch 6 Sep 2003 15:41:33 -0000 1.4
@@ -1,197 +1,3 @@
---- loader/module.c 2003-05-09 22:32:25.503966557 +0200
-+++ loader/module.c 2003-05-09 22:33:23.239737187 +0200
-@@ -40,8 +40,8 @@
-
- #ifdef EMU_QTX_API
- #include "wrapper.h"
--static int report_func(void *stack_base, int stack_size, reg386_t *reg, u_int32_t
*flags);
--static int report_func_ret(void *stack_base, int stack_size, reg386_t *reg,
u_int32_t *flags);
-+static int report_func(void *stack_base, int stack_size, reg386_t *reg, uint32_t
*flags);
-+static int report_func_ret(void *stack_base, int stack_size, reg386_t *reg,
uint32_t *flags);
- #endif
-
- //#undef TRACE
-@@ -638,10 +638,10 @@
-
- #ifdef EMU_QTX_API
-
--static u_int32_t ret_array[4096];
-+static uint32_t ret_array[4096];
- static int ret_i=0;
-
--static int report_func(void *stack_base, int stack_size, reg386_t *reg, u_int32_t
*flags)
-+static int report_func(void *stack_base, int stack_size, reg386_t *reg, uint32_t
*flags)
- {
- #ifdef DEBUG_QTX_API
- int i;
-@@ -697,14 +697,14 @@
- printf("FUNC[%X/%s]: wrapper=%p func=%p len=%d\n",reg->eax,
- pname?pname:"???",pwrapper,pptr,plen);
-
-- printf("FUNC: caller=%p ebx=%p\n",((u_int32_t *)stack_base)[0],reg->ebx);
-+ printf("FUNC: caller=%p ebx=%p\n",((uint32_t *)stack_base)[0],reg->ebx);
-
- if(pname)
- printf("%*sENTER(%d): %s(",ret_i*2,"",ret_i,pname);
- else
- printf("%*sENTER(%d): %X(",ret_i*2,"",ret_i,reg->eax);
- for (i=0;i<plen/4;i++){
-- unsigned int val=((u_int32_t *)stack_base)[1+i];
-+ unsigned int val=((uint32_t *)stack_base)[1+i];
- unsigned char* fcc=&val;
- printf("%s0x%X", i?", ":"",val);
- if(fcc[0]>=0x20 && fcc[0]<128 &&
-@@ -724,24 +724,24 @@
- // memory management:
- case 0x150011: //NewPtrClear
- case 0x150012: //NewPtrSysClear
-- reg->eax=(u_int32_t)malloc(((u_int32_t *)stack_base)[1]);
-- memset((void *)reg->eax,0,((u_int32_t *)stack_base)[1]);
-+ reg->eax=(uint32_t)malloc(((uint32_t *)stack_base)[1]);
-+ memset((void *)reg->eax,0,((uint32_t *)stack_base)[1]);
- #ifdef DEBUG_QTX_API
- printf("%*sLEAVE(%d): EMULATED! 0x%X\n",ret_i*2,"",ret_i, reg->eax);
- #endif
- return 1;
- case 0x15000F: //NewPtr
- case 0x150010: //NewPtrSys
-- reg->eax=(u_int32_t)malloc(((u_int32_t *)stack_base)[1]);
-+ reg->eax=(uint32_t)malloc(((uint32_t *)stack_base)[1]);
- #ifdef DEBUG_QTX_API
- printf("%*sLEAVE(%d): EMULATED! 0x%X\n",ret_i*2,"",ret_i, reg->eax);
- #endif
- return 1;
- case 0x15002f: //DisposePtr
-- if(((u_int32_t *)stack_base)[1]>=0x60000000)
-+ if(((uint32_t *)stack_base)[1]>=0x60000000)
- printf("WARNING! Invalid Ptr handle!\n");
- else
-- free((void *)((u_int32_t *)stack_base)[1]);
-+ free((void *)((uint32_t *)stack_base)[1]);
- reg->eax=0;
- #ifdef DEBUG_QTX_API
- printf("%*sLEAVE(%d): EMULATED! 0x%X\n",ret_i*2,"",ret_i, reg->eax);
-@@ -769,33 +769,33 @@
- #if 0
- switch(reg->eax){
- // case 0x00010000:
--// printf("FUNC:
ImageCodecInitialize/ImageCodecGetCodecInfo(ci=%p,&icap=%p)\n",((u_int32_t
*)stack_base)[1],((u_int32_t *)stack_base)[4]);
-+// printf("FUNC:
ImageCodecInitialize/ImageCodecGetCodecInfo(ci=%p,&icap=%p)\n",((uint32_t
*)stack_base)[1],((uint32_t *)stack_base)[4]);
- // break;
- case 0x00010003:
-- printf("FUNC: CountComponents(&desc=%p)\n",((u_int32_t *)stack_base)[1]);
-+ printf("FUNC: CountComponents(&desc=%p)\n",((uint32_t *)stack_base)[1]);
- break;
- case 0x00010004:
-- printf("FUNC: FindNextComponent(prev=%p,&desc=%p)\n",((u_int32_t
*)stack_base)[1],((u_int32_t *)stack_base)[2]);
-+ printf("FUNC: FindNextComponent(prev=%p,&desc=%p)\n",((uint32_t
*)stack_base)[1],((uint32_t *)stack_base)[2]);
- break;
- case 0x00010007:
-- printf("FUNC: OpenComponent(prev=%p)\n",((u_int32_t *)stack_base)[1]);
-+ printf("FUNC: OpenComponent(prev=%p)\n",((uint32_t *)stack_base)[1]);
- break;
- case 0x0003008b:
- printf("FUNC:
QTNewGWorldFromPtr(&pts=%p,fourcc=%.4s,&rect=%p,x1=%p,x2=%p,x3=%p,plane=%p,stride=%d)\n",
-- ((u_int32_t *)stack_base)[1],
-- &(((u_int32_t *)stack_base)[2]),
-- ((u_int32_t *)stack_base)[3],
-- ((u_int32_t *)stack_base)[4],
-- ((u_int32_t *)stack_base)[5],
-- ((u_int32_t *)stack_base)[6],
-- ((u_int32_t *)stack_base)[7],
-- ((u_int32_t *)stack_base)[8]);
-+ ((uint32_t *)stack_base)[1],
-+ &(((uint32_t *)stack_base)[2]),
-+ ((uint32_t *)stack_base)[3],
-+ ((uint32_t *)stack_base)[4],
-+ ((uint32_t *)stack_base)[5],
-+ ((uint32_t *)stack_base)[6],
-+ ((uint32_t *)stack_base)[7],
-+ ((uint32_t *)stack_base)[8]);
- break;
- case 0x001c0018:
-- printf("FUNC: GetGWorldPixMap(gworld=%p)\n",((u_int32_t *)stack_base)[1]);
-+ printf("FUNC: GetGWorldPixMap(gworld=%p)\n",((uint32_t *)stack_base)[1]);
- break;
- case 0x00110001:
-- printf("FUNC: Gestalt(fourcc=%.4s, &ret=%p)\n",&(((u_int32_t
*)stack_base)[1]),((u_int32_t *)stack_base)[2]);
-+ printf("FUNC: Gestalt(fourcc=%.4s, &ret=%p)\n",&(((uint32_t
*)stack_base)[1]),((uint32_t *)stack_base)[2]);
- break;
- default: {
- int i;
-@@ -820,34 +820,34 @@
- #endif
-
- // save ret addr:
-- ret_array[ret_i]=((u_int32_t *)stack_base)[0];
-+ ret_array[ret_i]=((uint32_t *)stack_base)[0];
- ++ret_i;
-
- #if 0
- // print first 7 longs in the stack (return address, arg[1], arg[2] ... )
- printf("stack[] = { ");
- for (i=0;i<7;i++) {
-- printf("%08x ", ((u_int32_t *)stack_base)[i]);
-+ printf("%08x ", ((uint32_t *)stack_base)[i]);
- }
- printf("}\n\n");
- #endif
-
- // // mess with function parameters
--// ((u_int32_t *)stack_base)[1] = 0x66554433;
-+// ((uint32_t *)stack_base)[1] = 0x66554433;
-
- // // mess with return address...
- // reg->eax = 0x11223344;
- return 0;
- }
-
--static int report_func_ret(void *stack_base, int stack_size, reg386_t *reg,
u_int32_t *flags)
-+static int report_func_ret(void *stack_base, int stack_size, reg386_t *reg,
uint32_t *flags)
- {
- int i;
- short err;
-
- // restore ret addr:
- --ret_i;
-- ((u_int32_t *)stack_base)[0]=ret_array[ret_i];
-+ ((uint32_t *)stack_base)[0]=ret_array[ret_i];
-
- #ifdef DEBUG_QTX_API
-
-@@ -873,7 +873,7 @@
- // print first 7 longs in the stack (return address, arg[1], arg[2] ... )
- printf("stack[] = { ");
- for (i=0;i<7;i++) {
-- printf("%08x ", ((u_int32_t *)stack_base)[i]);
-+ printf("%08x ", ((uint32_t *)stack_base)[i]);
- }
- printf("}\n\n");
- #endif
-@@ -881,7 +881,7 @@
- #endif
-
- // // mess with function parameters
--// ((u_int32_t *)stack_base)[1] = 0x66554433;
-+// ((uint32_t *)stack_base)[1] = 0x66554433;
-
- // // mess with return address...
- // reg->eax = 0x11223344;
---- loader/wrapper.h 2003-05-09 22:32:25.512549619 +0200
-+++ loader/wrapper.h 2003-05-09 22:33:04.632883306 +0200
-@@ -4,10 +4,10 @@
- #include <sys/types.h>
-
- typedef struct {
-- u_int32_t edi, esi, ebp, esp, ebx, edx, ecx, eax;
-+ uint32_t edi, esi, ebp, esp, ebx, edx, ecx, eax;
- } reg386_t;
-
--typedef int (*wrapper_func_t)(void *stack_base, int stack_size, reg386_t *reg,
u_int32_t *flags);
-+typedef int (*wrapper_func_t)(void *stack_base, int stack_size, reg386_t *reg,
uint32_t *flags);
-
- extern wrapper_func_t report_entry, report_ret;
-
--- loader/Makefile.orig Mon Mar 10 17:21:18 2003
+++ loader/Makefile Mon Aug 11 11:32:05 2003
@@ -17,7 +17,7 @@
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mplayer/mplayer.spec
============================================================================
$ cvs diff -u -r1.25 -r1.26 mplayer.spec
--- openpkg-src/mplayer/mplayer.spec 5 Sep 2003 18:00:54 -0000 1.25
+++ openpkg-src/mplayer/mplayer.spec 6 Sep 2003 15:41:33 -0000 1.26
@@ -38,7 +38,7 @@
Group: Video
License: GPL and others
Version: %{V_mplayer}
-Release: 20030905
+Release: 20030906
# build options
%option with_gui no
@@ -80,15 +80,47 @@
%patch0 -p0
%{l_shtool} subst \
-e 's;u_int\([0-9]*\)_t;uint\1_t;g' \
+ drivers/radeon/radeonfb.c \
+ etc/cygwin_inttypes.h \
+ loader/module.c \
+ loader/wrapper.h \
+ libmpdvdkit2/bsdi_ioctl.c \
+ libdha/sysdep/AsmMacros_alpha.h \
+ TVout/matroxset/matroxset.c \
+ TVout/matroxset/fb.h \
+ TVout/fbset/fbset.c \
+ TVout/fbset/fb.h \
+ TVout/con2fb/con2fb.c \
+ live/groupsock/GroupEId.cpp \
+ live/groupsock/Groupsock.cpp \
+ live/groupsock/GroupsockHelper.cpp \
+ live/groupsock/NetAddress.cpp \
live/groupsock/include/NetAddress.hh \
+ live/groupsock/include/NetCommon.h \
live/groupsock/include/GroupEId.hh \
live/groupsock/include/Groupsock.hh \
+ live/groupsock/include/GroupsockHelper.hh \
live/groupsock/include/TunnelEncaps.hh \
+ live/liveMedia/AC3AudioRTPSink.cpp \
+ live/liveMedia/AC3AudioStreamFramer.cpp \
+ live/liveMedia/AMRAudioRTPSink.cpp \
+ live/liveMedia/JPEGVideoRTPSink.cpp \
+ live/liveMedia/MPEG1or2VideoRTPSource.cpp \
+ live/liveMedia/MPEG4ESVideoRTPSink.cpp \
+ live/liveMedia/MPEG4GenericRTPSink.cpp \
+ live/liveMedia/MPEG4VideoStreamFramer.cpp \
+ live/liveMedia/MPEGVideoStreamParser.hh \
+ live/liveMedia/RTSPClient.cpp \
+ live/liveMedia/RTPSource.cpp \
+ live/liveMedia/StreamParser.hh \
+ live/liveMedia/include/AC3AudioRTPSink.hh \
+ live/liveMedia/include/AMRAudioFileSource.hh \
+ live/liveMedia/include/JPEGVideoSource.hh \
live/liveMedia/include/MediaSession.hh \
+ live/liveMedia/include/MPEG4GenericRTPSink.hh \
+ live/liveMedia/include/MPEG4VideoStreamFramer.hh \
live/liveMedia/include/RTPSource.hh \
- live/liveMedia/include/RTSPClient.hh \
- live/liveMedia/include/AC3AudioRTPSink.hh \
- live/liveMedia/include/MPEG4GenericRTPSink.hh
+ live/liveMedia/include/RTSPClient.hh
%build
# translate target names into qmake system types
@@ -160,6 +192,11 @@
fi
;;
esac
+
+ # temporary hack to fool faad dependencies
+ %{l_shtool} subst \
+ -e 's;#define FAADVERSION[ \t]*$;#define FAADVERSION 20;g' \
+ config.h
# build programs
%{l_make} %{l_mflags}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6431 -r1.6432 news.txt
--- openpkg-web/news.txt 6 Sep 2003 13:32:46 -0000 1.6431
+++ openpkg-web/news.txt 6 Sep 2003 15:41:32 -0000 1.6432
@@ -1,3 +1,4 @@
+06-Sep-2003: Upgraded package: P<mplayer-1.0pre1-20030906>
06-Sep-2003: Upgraded package: P<qt-3.2.1-20030906>
06-Sep-2003: Upgraded package: P<pnetlib-0.5.12-20030906>
06-Sep-2003: Upgraded package: P<pnet-0.5.12-20030906>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
