Merge bk://oe-devel@oe-devel.bkbits.net/openembedded

into tim.rpsys.net:/usr/oe/openembedded

2005/04/19 12:46:21+01:00 (none)!XorA
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into cimmeria.(none):/home/dp/zaurus/openembedded

2005/04/19 12:45:39+01:00 (none)!XorA
Removed bogus -lts

BKrev: 4264f183wxyVkZIlAeNHCuBeHHGfEg

diff --git a/packages/mplayer/mplayer-1.0pre7/Makefile.patch b/packages/mplayer/mplayer-1.0pre7/Makefile.patch
index e69de29..07d8cd1 100644 (file)
--- a/packages/mplayer/mplayer-1.0pre7/Makefile.patch
+++ b/packages/mplayer/mplayer-1.0pre7/Makefile.patch
@@ -0,0 +1,40 @@
+--- MPlayer-1.0pre7/Makefile.orig      2005-04-18 09:01:02.021562376 +0100
++++ MPlayer-1.0pre7/Makefile   2005-04-18 09:11:13.018676696 +0100
+@@ -8,11 +8,6 @@
+ 
+ PRG_CFG = codec-cfg
+ 
+-# 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)
+ SUBDIRS += libdha vidix
+@@ -244,7 +239,7 @@
+     ifeq ($(TARGET_WIN32),yes)
+       windres -o osdep/mplayer-rc.o osdep/mplayer.rc
+     endif
+-      $(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) $(MATH_LIB)
++      $(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) $(MATH_LIB) -ljpeg -lpng $(LDFLAGS)
+ 
+ mplayer.exe.spec.c: libmpcodecs/libmpcodecs.a
+       winebuild -fPIC -o mplayer.exe.spec.c -exe mplayer.exe -mcui \
+@@ -277,7 +272,7 @@
+ $(MENCODER_DEP): version.h help_mp.h
+ 
+ $(PRG_CFG): version.h codec-cfg.c codec-cfg.h
+-      $(HOST_CC) $(HOST_CFLAGS) -I. -g codec-cfg.c mp_msg.c -o $(PRG_CFG) -DCODECS2HTML $(EXTRA_LIB) $(EXTRA_INC) $(I18NLIBS)
++      $(BUILD_CC) -Ilibmpdemux -Iloader -Ilibvo -I. -g codec-cfg.c mp_msg.c -o $(PRG_CFG) -DCODECS2HTML $(EXTRA_LIB) $(EXTRA_INC) $(I18NLIBS)
+ 
+ install: $(ALL_PRG)
+ ifeq ($(VIDIX),yes)
+@@ -365,7 +360,6 @@
+       @for a in $(PARTS); do $(MAKE) -C $$a distclean; done
+ 
+ strip:
+-      strip -s $(ALL_PRG)
+ 
+ dep:  depend
+