diff options
| -rw-r--r-- | packages/mplayer/files/Makefile-codec-cfg.patch | 18 | ||||
| -rw-r--r-- | packages/mplayer/files/makefile-nostrip-svn.patch | 26 | ||||
| -rw-r--r-- | packages/mplayer/files/makefile-nostrip.patch | 13 | ||||
| -rw-r--r-- | packages/mplayer/mplayer_0.0+1.0rc1.bb | 1 | ||||
| -rw-r--r-- | packages/mplayer/mplayer_svn.bb | 5 |
5 files changed, 53 insertions, 10 deletions
diff --git a/packages/mplayer/files/Makefile-codec-cfg.patch b/packages/mplayer/files/Makefile-codec-cfg.patch index 8eec79f291..f1fe636df2 100644 --- a/packages/mplayer/files/Makefile-codec-cfg.patch +++ b/packages/mplayer/files/Makefile-codec-cfg.patch @@ -1,11 +1,13 @@ ---- trunk/Makefile.orig 2006-07-24 09:55:12.000000000 +0100 -+++ trunk/Makefile 2006-07-24 09:56:18.000000000 +0100 -@@ -410,7 +410,7 @@ - endif +Index: trunk/Makefile +=================================================================== +--- trunk.orig/Makefile ++++ trunk/Makefile +@@ -239,7 +239,7 @@ mencoder$(EXESUF): $(MENCODER_DEPS) + $(CC) -o $@ $^ $(LDFLAGS_MENCODER) - codec-cfg: codec-cfg.c codec-cfg.h help_mp.h + codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h - $(HOST_CC) -I. -DCODECS2HTML codec-cfg.c -o $@ -+ $(BUILD_CC) -Ilibmpdemux -Iloader -Ilibvo -I. -DCODECS2HTML codec-cfg.c -o $@ ++ $(BUILD_CC) -I. -DCODECS2HTML codec-cfg.c -o $@ - codecs.conf.h: codec-cfg etc/codecs.conf - ./codec-cfg ./etc/codecs.conf > $@ + codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf + ./codec-cfg$(EXESUF) ./etc/codecs.conf > $@ diff --git a/packages/mplayer/files/makefile-nostrip-svn.patch b/packages/mplayer/files/makefile-nostrip-svn.patch new file mode 100644 index 0000000000..0c3180c728 --- /dev/null +++ b/packages/mplayer/files/makefile-nostrip-svn.patch @@ -0,0 +1,26 @@ +Index: trunk/Makefile +=================================================================== +--- trunk.orig/Makefile ++++ trunk/Makefile +@@ -253,10 +253,10 @@ install: $(ALL_PRG) + ifeq ($(VIDIX),yes) + $(MAKE) -C libdha install + mkdir -p $(LIBDIR)/mplayer/vidix +- -install -m 755 $(INSTALLSTRIP) -p vidix/drivers/*.so $(LIBDIR)/mplayer/vidix ++ -install -m 755 -p vidix/drivers/*.so $(LIBDIR)/mplayer/vidix + endif + $(INSTALL) -d $(BINDIR) +- $(INSTALL) -m 755 $(INSTALLSTRIP) mplayer$(EXESUF) \ ++ $(INSTALL) -m 755 mplayer$(EXESUF) \ + $(BINDIR)/mplayer$(EXESUF) + ifeq ($(GUI),yes) + -ln -sf mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF) +@@ -271,7 +271,7 @@ endif + fi ; \ + done + ifeq ($(MENCODER),yes) +- $(INSTALL) -m 755 $(INSTALLSTRIP) mencoder$(EXESUF) \ ++ $(INSTALL) -m 755 mencoder$(EXESUF) \ + $(BINDIR)/mencoder$(EXESUF) + for i in $(MAN_LANG); do \ + if test "$$i" = en ; then \ diff --git a/packages/mplayer/files/makefile-nostrip.patch b/packages/mplayer/files/makefile-nostrip.patch new file mode 100644 index 0000000000..77b50a840a --- /dev/null +++ b/packages/mplayer/files/makefile-nostrip.patch @@ -0,0 +1,13 @@ +Index: MPlayer-1.0rc1/Makefile +=================================================================== +--- MPlayer-1.0rc1.orig/Makefile ++++ MPlayer-1.0rc1/Makefile +@@ -416,7 +416,7 @@ ifeq ($(VIDIX),yes) + $(MAKE) -C vidix install + endif + $(INSTALL) -d $(BINDIR) +- $(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG) $(BINDIR)/$(PRG) ++ $(INSTALL) -m 755 $(PRG) $(BINDIR)/$(PRG) + ifeq ($(GUI),yes) + -ln -sf $(PRG) $(BINDIR)/gmplayer + endif diff --git a/packages/mplayer/mplayer_0.0+1.0rc1.bb b/packages/mplayer/mplayer_0.0+1.0rc1.bb index f91a06d424..41b50bd656 100644 --- a/packages/mplayer/mplayer_0.0+1.0rc1.bb +++ b/packages/mplayer/mplayer_0.0+1.0rc1.bb @@ -15,6 +15,7 @@ SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc1.tar.bz2 \ file://w100-video_out.patch;patch=1 \ file://w100-mplayer.patch;patch=1 \ file://pld-onlyarm5.patch;patch=1 \ + file://makefile-nostrip.patch;patch=1 \ ${SOURCEFORGE_MIRROR}/libw100/mplayer-imageon.patch;patch=1 \ file://imageon-video_out.patch;patch=1" diff --git a/packages/mplayer/mplayer_svn.bb b/packages/mplayer/mplayer_svn.bb index dd78992d23..5dca7401c9 100644 --- a/packages/mplayer/mplayer_svn.bb +++ b/packages/mplayer/mplayer_svn.bb @@ -12,8 +12,9 @@ SRC_URI = "svn://svn.mplayerhq.hu/mplayer;module=trunk \ 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" + file://w100-mplayer.patch;patch= \ + file://pld-onlyarm5.patch;patch=1 \ + file://makefile-nostrip-svn.patch;patch=1" RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" |