diff options
Diffstat (limited to 'packages/mplayer/files')
| -rw-r--r-- | packages/mplayer/files/Makefile.patch | 22 | ||||
| -rw-r--r-- | packages/mplayer/files/libmpcodecs-ogg-include.patch | 13 | ||||
| -rw-r--r-- | packages/mplayer/files/libmpdemux-ogg-include.patch | 13 | ||||
| -rw-r--r-- | packages/mplayer/files/w100-configure-svn.patch | 48 | ||||
| -rw-r--r-- | packages/mplayer/files/w100-mplayer.patch | 15 |
5 files changed, 66 insertions, 45 deletions
diff --git a/packages/mplayer/files/Makefile.patch b/packages/mplayer/files/Makefile.patch index b9b68491c5..f0464b9176 100644 --- a/packages/mplayer/files/Makefile.patch +++ b/packages/mplayer/files/Makefile.patch @@ -1,15 +1,13 @@ -Index: MPlayer-1.0pre8/Makefile +Index: MPlayer-1.0rc1/Makefile =================================================================== ---- MPlayer-1.0pre8.orig/Makefile -+++ MPlayer-1.0pre8/Makefile -@@ -438,8 +438,8 @@ codecs2html: mp_msg.o - $(CC) -DCODECS2HTML codec-cfg.c mp_msg.o -o $@ +--- MPlayer-1.0rc1.orig/Makefile ++++ MPlayer-1.0rc1/Makefile +@@ -399,7 +399,7 @@ osdep/mplayer-rc.o: osdep/mplayer.rc + windres -o $@ osdep/mplayer.rc - $(PRG_CFG): codec-cfg.c codec-cfg.h help_mp.h -- $(HOST_CC) $(HOST_CFLAGS) -I. codec-cfg.c -o $(PRG_CFG) \ -- -DCODECS2HTML $(EXTRA_LIB) $(EXTRA_INC) -+ $(BUILD_CC) -Ilibmpdemux -Iloader -Ilibvo -I. codec-cfg.c -o $(PRG_CFG) \ -+ -DCODECS2HTML + codec-cfg: codec-cfg.c codec-cfg.h help_mp.h +- $(HOST_CC) -I. -DCODECS2HTML codec-cfg.c -o $@ ++ $(BUILD_CC) -I. -DCODECS2HTML codec-cfg.c -o $@ - install: $(ALL_PRG) - ifeq ($(VIDIX),yes) + codecs.conf.h: codec-cfg etc/codecs.conf + ./codec-cfg ./etc/codecs.conf > $@ diff --git a/packages/mplayer/files/libmpcodecs-ogg-include.patch b/packages/mplayer/files/libmpcodecs-ogg-include.patch deleted file mode 100644 index 619c4b0cd2..0000000000 --- a/packages/mplayer/files/libmpcodecs-ogg-include.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- MPlayer-1.0pre8/libmpcodecs/Makefile.orig 2006-06-30 23:26:33.000000000 +0100 -+++ MPlayer-1.0pre8/libmpcodecs/Makefile 2006-06-30 23:28:52.000000000 +0100 -@@ -267,8 +267,8 @@ - SRCS2=$(ENCODER_SRCS) - OBJS2=$(SRCS2:.c=.o) - --CFLAGS = $(OPTFLAGS) \ -- -I. -I.. \ -+CFLAGS = -I.. $(OPTFLAGS) \ -+ -I. \ - -Inative \ - -I../libmpdemux \ - -I../loader \ diff --git a/packages/mplayer/files/libmpdemux-ogg-include.patch b/packages/mplayer/files/libmpdemux-ogg-include.patch deleted file mode 100644 index 541f4a03ee..0000000000 --- a/packages/mplayer/files/libmpdemux-ogg-include.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- MPlayer-1.0pre8/libmpdemux/Makefile.orig 2006-06-30 23:26:49.000000000 +0100 -+++ MPlayer-1.0pre8/libmpdemux/Makefile 2006-06-30 23:27:10.000000000 +0100 -@@ -156,8 +156,8 @@ - - OBJS = $(SRCS:.c=.o) - OBJS += $(CPLUSPLUSSRCS:.cpp=.o) --INCLUDE = -I.. -I../loader $(CSS_INC) $(EXTRA_INC) $(LIBAV_INC) --CFLAGS = $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS) $(CDPARANOIA_INC) $(DVB_INC) -+INCLUDE = -I../loader $(CSS_INC) $(EXTRA_INC) $(LIBAV_INC) -+CFLAGS = -I.. $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS) $(CDPARANOIA_INC) $(DVB_INC) - CPLUSPLUSFLAGS = $(CFLAGS) $(CPLUSPLUSINCLUDE) -D__STDC_LIMIT_MACROS - CPLUSPLUS = $(CC) - diff --git a/packages/mplayer/files/w100-configure-svn.patch b/packages/mplayer/files/w100-configure-svn.patch new file mode 100644 index 0000000000..e3067a4724 --- /dev/null +++ b/packages/mplayer/files/w100-configure-svn.patch @@ -0,0 +1,48 @@ +Index: trunk/configure +=================================================================== +--- trunk.orig/configure ++++ trunk/configure +@@ -1623,6 +1623,7 @@ _caca=auto + _svga=auto + _vesa=auto + _fbdev=auto ++_w100=no + _dvb=auto + _dvbhead=auto + _dxr2=auto +@@ -1822,6 +1823,8 @@ for ac_option do + --disable-vesa) _vesa=no ;; + --enable-fbdev) _fbdev=yes ;; + --disable-fbdev) _fbdev=no ;; ++ --enable-w100) _w100=yes ;; ++ --disable-w100) _w100=no ;; + --enable-dvb) _dvb=yes ;; + --disable-dvb) _dvb=no ;; + --enable-dvbhead) _dvbhead=yes ;; +@@ -4280,6 +4283,18 @@ else + fi + echores "$_fbdev" + ++echocheck "ATI Imageon 100 (w100)" ++if test "$_w100" = yes ; then ++ _def_w100='#define HAVE_W100 1' ++ _ld_w100='-laticore' ++ _libs_mplayer="$_libs_mplayer $_ld_w100" ++ _vosrc="$_vosrc vo_w100.c" ++ _vomodules="w100 $_vomodules" ++else ++ _def_w100='#undef HAVE_W100' ++ _novomodules="w100 $_novomodules" ++fi ++echores "$_w100" + + + echocheck "DVB" +@@ -8227,6 +8242,7 @@ $_def_mga + $_def_xmga + $_def_syncfb + $_def_fbdev ++$_def_w100 + $_def_dxr2 + $_def_dxr3 + $_def_ivtv diff --git a/packages/mplayer/files/w100-mplayer.patch b/packages/mplayer/files/w100-mplayer.patch index 4bed6326d1..8ce37d014c 100644 --- a/packages/mplayer/files/w100-mplayer.patch +++ b/packages/mplayer/files/w100-mplayer.patch @@ -1,6 +1,8 @@ ---- mplayer_20060519/mplayer.c.orig 2006-05-30 12:31:01.000000000 +0100 -+++ mplayer_20060519/mplayer.c 2006-05-30 12:33:41.000000000 +0100 -@@ -628,6 +628,18 @@ +Index: MPlayer-1.0rc1/mplayer.c +=================================================================== +--- MPlayer-1.0rc1.orig/mplayer.c ++++ MPlayer-1.0rc1/mplayer.c +@@ -807,6 +807,17 @@ static void exit_sighandler(int x){ exit_player(NULL); } @@ -15,11 +17,10 @@ + } +} + -+ - //extern void write_avi_header_1(FILE *f,int fcc,float fps,int width,int height); - extern void mp_input_register_options(m_config_t* cfg); -@@ -2732,6 +2744,9 @@ + + #include "mixer.h" +@@ -3216,6 +3227,9 @@ current_module = NULL; #endif #endif |