diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2006-12-06 10:22:18 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2006-12-06 10:22:18 +0000 |
| commit | 5b541ff766ed2a9ed77cd68ed558651a4fa5f5ae (patch) | |
| tree | 14de51ecd90049495ddaaab4f1a54efc0e4b2733 | |
| parent | 71b645d6d468556b98ea362591e317289e823dac (diff) | |
mplayer_svn.bb : update to latest svn
| -rw-r--r-- | packages/mplayer/files/w100-configure-svn.patch | 48 | ||||
| -rw-r--r-- | packages/mplayer/mplayer_svn.bb | 29 |
2 files changed, 61 insertions, 16 deletions
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/mplayer_svn.bb b/packages/mplayer/mplayer_svn.bb index ee0ba7921c..dd78992d23 100644 --- a/packages/mplayer/mplayer_svn.bb +++ b/packages/mplayer/mplayer_svn.bb @@ -5,23 +5,20 @@ HOMEPAGE = "http://www.mplayerhq.hu/" DEPENDS = "virtual/libsdl libmad zlib libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses lame" RDEPENDS = "mplayer-common" LICENSE = "GPL" -SRC_URI = "svn://svn.mplayerhq.hu/;module=mplayer \ - file://vo_w100.c \ - file://vo_w100_api.h \ - file://vo_w100_fb.h \ - file://Makefile-codec-cfg.patch;patch=1 \ - file://w100-configure.patch;patch=1 \ - file://w100-Makefile.patch;patch=1 \ - file://w100-video_out.patch;patch=1 \ - file://w100-mplayer.patch;patch= \ - file://libmpdemux-ogg-include-svn.patch;patch=1 \ - file://libmpcodecs-ogg-include.patch;patch=1 \ +SRC_URI = "svn://svn.mplayerhq.hu/mplayer;module=trunk \ + file://vo_w100.c \ + file://vo_w100_api.h \ + file://vo_w100_fb.h \ + file://Makefile-codec-cfg.patch;patch=1 \ + file://w100-configure-svn.patch;patch=1 \ + file://w100-video_out.patch;patch=1 \ + file://w100-mplayer.patch;patch= \ file://pld-onlyarm5.patch;patch=1" RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" -PV = "1.0pre8+svn${SRCDATE}" +PV = "0.0+1.0rc1+svn${SRCDATE}" PR = "r1" DEFAULT_PREFERENCE = "-1" @@ -29,7 +26,7 @@ PARALLEL_MAKE = "" DEPENDS_append_c7x0 = " sharp-aticore-oss" -S = "${WORKDIR}/mplayer/trunk/" +S = "${WORKDIR}/trunk/" PACKAGES =+ "mencoder" @@ -53,7 +50,6 @@ EXTRA_OECONF = " \ --disable-vm \ --disable-xf86keysym \ --disable-tv \ - --disable-tv-v4l \ --disable-tv-v4l2 \ --disable-tv-bsdbt848 \ --enable-rtc \ @@ -61,8 +57,10 @@ EXTRA_OECONF = " \ --disable-winsock2 \ --disable-smb \ --disable-live \ + --disable-dvdnav \ --disable-dvdread \ - --disable-mpdvdkit \ + --disable-dvdread-internal \ + --disable-libdvdcss-internal \ --disable-cdparanoia \ --enable-freetype \ --disable-unrarlib \ @@ -92,7 +90,6 @@ EXTRA_OECONF = " \ --disable-libavcodec_so \ --disable-libavformat_so \ --disable-libpostproc_so \ - --disable-libfame \ \ --enable-tremor-low \ \ |