diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2004-12-25 23:40:06 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2004-12-25 23:40:06 +0000 |
| commit | f5771cdc785a766fda704dce8961e0e205961d95 (patch) | |
| tree | 1046fb26e156e196aede94ada820e1daf8715ffa /packages | |
| parent | bf780782f7fe67402bcf801d51036692341e1cd8 (diff) | |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2004/12/26 00:13:23+01:00 dyndns.org!reenoo
mplayer: fix Makefile.patch (missing reference to LDFLAGS). fix DEPENDS (virtual/libsdl). fix libpostproc packaging
BKrev: 41cdfa56W2WcqmgESxkmYbXGsmJxKw
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/mplayer/mplayer-1.0pre3try2/Makefile.patch | 41 | ||||
| -rw-r--r-- | packages/mplayer/mplayer_1.0pre3try2.bb | 6 |
2 files changed, 44 insertions, 3 deletions
diff --git a/packages/mplayer/mplayer-1.0pre3try2/Makefile.patch b/packages/mplayer/mplayer-1.0pre3try2/Makefile.patch index e69de29bb2..b6029a8f6c 100644 --- a/packages/mplayer/mplayer-1.0pre3try2/Makefile.patch +++ b/packages/mplayer/mplayer-1.0pre3try2/Makefile.patch @@ -0,0 +1,41 @@ +--- ./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 + +-# Do not strip the binaries at installation +-ifeq ($(STRIPBINARIES),yes) +-INSTALLSTRIP = -s +-endif + + # These subdirectories require installation due to binaries within them. + ifeq ($(VIDIX),yes) +@@ -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 $(LDFLAGS) ++ + + 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) -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/packages/mplayer/mplayer_1.0pre3try2.bb b/packages/mplayer/mplayer_1.0pre3try2.bb index 61948f4946..78e1597bbf 100644 --- a/packages/mplayer/mplayer_1.0pre3try2.bb +++ b/packages/mplayer/mplayer_1.0pre3try2.bb @@ -2,8 +2,8 @@ DESCRIPTION = "Open Source multimedia player." SECTION = "opie/multimedia" PRIORITY = "optional" HOMEPAGE = "http://www.mplayerhq.hu/" -DEPENDS = "libsdl-qpe libmad tremor-20021126 libogg libvorbis zlib libpng jpeg" -PR = "r3" +DEPENDS = "virtual/libsdl libmad tremor-20021126 libogg libvorbis zlib libpng jpeg" +PR = "r4" SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \ file://Makefile.patch;patch=0 \ @@ -76,11 +76,11 @@ do_configure() { do_install_append () { install -d ${D}/${libdir} ${D}/usr/include ${D}/usr/include/postproc install -m 0644 libavcodec/libpostproc/postprocess.h ${D}/usr/include/postproc/ + oe_libinstall -so -C ${S}/libavcodec/libpostproc libpostproc ${D}/${libdir} cp ${S}/libavcodec/libpostproc/libpostproc.so ${D}/usr/lib/libpostproc.so.0.0.0 cd ${D}/usr/lib ln -sf libpostproc.so.0.0.0 libpostproc.so.0 ln -sf libpostproc.so.0 libpostproc.so - oe_libinstall -so -C ${S}/libavcodec/libpostproc libpostproc ${D}/${libdir} } do_stage () { |