diff options
| author | Tim Ansell <mithro@mithis.com> | 2004-09-26 16:18:58 +0000 |
|---|---|---|
| committer | Tim Ansell <mithro@mithis.com> | 2004-09-26 16:18:58 +0000 |
| commit | af15d336ac814889700735b1cdeac880e29211b2 (patch) | |
| tree | ce0e67eb8cc6bbccae10d97428aafe6caec57495 /mplayer | |
| parent | 782d58916701d9a1d60005730783f1050e923049 (diff) | |
SDL now works for the non w100 mplayer version
BKrev: 4156ebf2yhfpWgyEDqBjN6Ux_kwPfQ
Diffstat (limited to 'mplayer')
| -rw-r--r-- | mplayer/mplayer-1.0pre3try2/Makefile.patch | 27 | ||||
| -rw-r--r-- | mplayer/mplayer-1.0pre3try2/sdl.patch | 0 | ||||
| -rw-r--r-- | mplayer/mplayer_1.0pre3try2.oe | 13 |
3 files changed, 32 insertions, 8 deletions
diff --git a/mplayer/mplayer-1.0pre3try2/Makefile.patch b/mplayer/mplayer-1.0pre3try2/Makefile.patch index eb9a07d4f8..6cd49bb1c8 100644 --- a/mplayer/mplayer-1.0pre3try2/Makefile.patch +++ b/mplayer/mplayer-1.0pre3try2/Makefile.patch @@ -1,5 +1,5 @@ ---- ./Makefile~Makefile.patch 2003-12-09 08:03:31.000000000 +1030 -+++ ./Makefile 2004-09-24 02:08:50.000000000 +0930 +--- ./Makefile~Makefile.patch 2004-09-24 20:07:12.000000000 +0930 ++++ ./Makefile 2004-09-24 20:09:38.000000000 +0930 @@ -10,10 +10,6 @@ PRG_CFG = codec-cfg PRG_MENCODER = mencoder @@ -11,12 +11,31 @@ # These subdirectories require installation due to binaries within them. ifeq ($(VIDIX),yes) -@@ -246,7 +242,7 @@ +@@ -212,7 +208,8 @@ + + $(PRG): $(MPLAYER_DEP) + ./darwinfixlib.sh $(MPLAYER_DEP) +- $(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) $(ARCH_LIB) $(I18NLIBS) -lm ++ $(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(STATIC_LIB) $(ARCH_LIB) $(I18NLIBS) -lm -ljpeg -lpng -lts ++ + + mplayer.exe.spec.c: libmpcodecs/libmpcodecs.a + winebuild -fPIC -o mplayer.exe.spec.c -exe mplayer.exe -mcui \ +@@ -246,7 +243,7 @@ $(MENCODER_DEP): version.h $(PRG_CFG): version.h codec-cfg.c codec-cfg.h - $(CC) $(CFLAGS) -g codec-cfg.c mp_msg.c -o $(PRG_CFG) -DCODECS2HTML $(EXTRA_LIB) $(I18NLIBS) -+ $(BUILD_CC) $(CFLAGS) -g codec-cfg.c mp_msg.c -o $(PRG_CFG) -DCODECS2HTML $(EXTRA_LIB) $(I18NLIBS) ++ $(BUILD_CC) -Ilibmpdemux -Iloader -Ilibvo -g codec-cfg.c mp_msg.c -o $(PRG_CFG) -DCODECS2HTML $(EXTRA_LIB) $(I18NLIBS) install: $(ALL_PRG) ifeq ($(VIDIX),yes) +@@ -316,7 +313,7 @@ + -$(MAKE) -C libavcodec distclean LIBPREF=lib LIBSUF=.a + + strip: +- strip -s $(ALL_PRG) ++ + + dep: depend + diff --git a/mplayer/mplayer-1.0pre3try2/sdl.patch b/mplayer/mplayer-1.0pre3try2/sdl.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/mplayer/mplayer-1.0pre3try2/sdl.patch diff --git a/mplayer/mplayer_1.0pre3try2.oe b/mplayer/mplayer_1.0pre3try2.oe index ac3f6029e2..1873bbd8ab 100644 --- a/mplayer/mplayer_1.0pre3try2.oe +++ b/mplayer/mplayer_1.0pre3try2.oe @@ -1,21 +1,26 @@ DESCRIPTION = "Open Source multimedia player." SECTION = "opie/games" PRIORITY = "optional" -DEPENDS = "libsdl-qpe libmad tremor-20030325 libogg libvorbis zlib" +DEPENDS = "libsdl-qpe libmad tremor-20030325 libogg libvorbis zlib libpng jpeg sharp-aticore" SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \ file://Makefile.patch;patch=0 \ + file://sdl.patch;patch=0 \ file://zlib.patch;patch=0 " S = "${WORKDIR}/MPlayer-${PV}" +PACKAGES="${PN} postproc postproc-dev" + FILES_${PN} = " \ - /usr/local/bin/mplayer \ - /usr/local/man/man1/mplayer.1 " + /usr/local/bin/mplayer " + +FILES_postproc = "" inherit autotools EXTRA_OECONF = " \ - --target=arm \ + --prefix=/usr \ + --target=${PACKAGE_ARCH} \ \ --disable-win32 \ --disable-macosx \ |