[oe-commits] org.oe.oz354x mplayer_1.0rc1.bb : sync mplayer version with .dev latest.

xora commit openembedded-commits at lists.openembedded.org
Mon Dec 18 09:03:52 UTC 2006 

mplayer_1.0rc1.bb : sync mplayer version with .dev latest.

removed old versions of mplayer and mplayer-atty as they are obsoleted by
this change.

Fixed bug #1666 for the branch by added a collie specific patch to remove
mplayers noexecstack flags. As for some reason collie alone has all .so's
set to executable stacks.

Thanks to the reporter of #1666 for the patch.

Author: xora at openembedded.org
Branch: org.openembedded.oz354x
Revision: a1dd3b2f391c5055cbdc253d9b3ae46abe32415b
ViewMTN: http://monotone.openembedded.org/revision.psp?id=a1dd3b2f391c5055cbdc253d9b3ae46abe32415b
Files:
1
packages/mplayer/mplayer-1.0pre7
packages/mplayer/mplayer-1.0pre7/Makefile-vidix.patch
packages/mplayer/mplayer-1.0pre7/Makefile.patch
packages/mplayer/mplayer-1.0pre7/libmpcodecs-ogg-include.patch
packages/mplayer/mplayer-1.0pre7/libmpdemux-ogg-include.patch
packages/mplayer/mplayer-1.0pre7/mplayer-w100_1.0pre3.1.modified.diff
packages/mplayer/mplayer-1.0pre7/sdl.patch
packages/mplayer/mplayer-1.0pre7/vidix-drivers-w100.patch
packages/mplayer/mplayer-1.0pre7/zlib.patch
packages/mplayer/mplayer-1.0pre8
packages/mplayer/mplayer-1.0pre8/libmpcodecs-ogg-include.patch
packages/mplayer/mplayer-1.0pre8/libmpdemux-ogg-include.patch
packages/mplayer/mplayer-atty-1.1.5
packages/mplayer/mplayer-atty-1.1.5/Makefile-libs.patch
packages/mplayer/mplayer-atty-1.1.5/Makefile.patch
packages/mplayer/mplayer-atty-1.1.5/alsa-configure.patch
packages/mplayer/mplayer-atty-1.1.5/dsputil.patch
packages/mplayer/mplayer-atty-1.1.5/libmpcodecs-ogg-include.patch
packages/mplayer/mplayer-atty-1.1.5/libmpdemux-ogg-include.patch
packages/mplayer/mplayer-atty-1.1.5/sdl.patch
packages/mplayer/mplayer-atty_1.1.5.bb
packages/mplayer/mplayer_1.0pre7.bb
packages/mplayer/mplayer_1.0pre8.bb
changed
packages/mplayer/files/disable-executable-stack-test.patch
packages/mplayer/files/makefile-nostrip.patch
packages/mplayer/mplayer_1.0rc1.bb
packages/mplayer/files/Makefile.patch
packages/mplayer/files/w100-mplayer.patch
Diffs:

#
# mt diff -r1274d84ab63904740b76a925b4b013d3cd2b1695 -ra1dd3b2f391c5055cbdc253d9b3ae46abe32415b
#
# 
# 
# delete "packages/mplayer/mplayer-1.0pre7"
# 
# delete "packages/mplayer/mplayer-1.0pre7/Makefile-vidix.patch"
# 
# delete "packages/mplayer/mplayer-1.0pre7/Makefile.patch"
# 
# delete "packages/mplayer/mplayer-1.0pre7/libmpcodecs-ogg-include.patch"
# 
# delete "packages/mplayer/mplayer-1.0pre7/libmpdemux-ogg-include.patch"
# 
# delete "packages/mplayer/mplayer-1.0pre7/mplayer-w100_1.0pre3.1.modified.diff"
# 
# delete "packages/mplayer/mplayer-1.0pre7/sdl.patch"
# 
# delete "packages/mplayer/mplayer-1.0pre7/vidix-drivers-w100.patch"
# 
# delete "packages/mplayer/mplayer-1.0pre7/zlib.patch"
# 
# delete "packages/mplayer/mplayer-1.0pre8"
# 
# delete "packages/mplayer/mplayer-1.0pre8/libmpcodecs-ogg-include.patch"
# 
# delete "packages/mplayer/mplayer-1.0pre8/libmpdemux-ogg-include.patch"
# 
# delete "packages/mplayer/mplayer-atty-1.1.5"
# 
# delete "packages/mplayer/mplayer-atty-1.1.5/Makefile-libs.patch"
# 
# delete "packages/mplayer/mplayer-atty-1.1.5/Makefile.patch"
# 
# delete "packages/mplayer/mplayer-atty-1.1.5/alsa-configure.patch"
# 
# delete "packages/mplayer/mplayer-atty-1.1.5/dsputil.patch"
# 
# delete "packages/mplayer/mplayer-atty-1.1.5/libmpcodecs-ogg-include.patch"
# 
# delete "packages/mplayer/mplayer-atty-1.1.5/libmpdemux-ogg-include.patch"
# 
# delete "packages/mplayer/mplayer-atty-1.1.5/sdl.patch"
# 
# delete "packages/mplayer/mplayer-atty_1.1.5.bb"
# 
# delete "packages/mplayer/mplayer_1.0pre7.bb"
# 
# delete "packages/mplayer/mplayer_1.0pre8.bb"
# 
# add_file "changed"
#  content [0d392f6d257d1fb4cc31babdd306aba8ad487ff3]
# 
# add_file "packages/mplayer/files/disable-executable-stack-test.patch"
#  content [ce1b9d60646b6c8a9407d926b92371d3f80fbb0a]
# 
# add_file "packages/mplayer/files/makefile-nostrip.patch"
#  content [7e191a9ab89499e122b1422609ec9e39f383f8b2]
# 
# add_file "packages/mplayer/mplayer_1.0rc1.bb"
#  content [c2e64d43ef6073b8b870c254748ec449099752bb]
# 
# patch "packages/mplayer/files/Makefile.patch"
#  from [6ae1eb74eb1fc8fa979fcda1faeaf8103f40a999]
#    to [d280c2462ddfd9742deeff069234893541c65574]
# 
# patch "packages/mplayer/files/w100-mplayer.patch"
#  from [85fb301c62127f92f6fc40768d5e67f405bd67f1]
#    to [74140fd2e25ef3370f882b4069f45ead258ff924]
# 
============================================================
--- changed	0d392f6d257d1fb4cc31babdd306aba8ad487ff3
+++ changed	0d392f6d257d1fb4cc31babdd306aba8ad487ff3
@@ -0,0 +1,23 @@
+packages/mplayer/mplayer-1.0pre7
+packages/mplayer/mplayer-1.0pre7/Makefile-vidix.patch
+packages/mplayer/mplayer-1.0pre7/Makefile.patch
+packages/mplayer/mplayer-1.0pre7/libmpcodecs-ogg-include.patch
+packages/mplayer/mplayer-1.0pre7/libmpdemux-ogg-include.patch
+packages/mplayer/mplayer-1.0pre7/mplayer-w100_1.0pre3.1.modified.diff
+packages/mplayer/mplayer-1.0pre7/sdl.patch
+packages/mplayer/mplayer-1.0pre7/vidix-drivers-w100.patch
+packages/mplayer/mplayer-1.0pre7/zlib.patch
+packages/mplayer/mplayer-1.0pre8
+packages/mplayer/mplayer-1.0pre8/libmpcodecs-ogg-include.patch
+packages/mplayer/mplayer-1.0pre8/libmpdemux-ogg-include.patch
+packages/mplayer/mplayer-atty-1.1.5
+packages/mplayer/mplayer-atty-1.1.5/Makefile-libs.patch
+packages/mplayer/mplayer-atty-1.1.5/Makefile.patch
+packages/mplayer/mplayer-atty-1.1.5/alsa-configure.patch
+packages/mplayer/mplayer-atty-1.1.5/dsputil.patch
+packages/mplayer/mplayer-atty-1.1.5/libmpcodecs-ogg-include.patch
+packages/mplayer/mplayer-atty-1.1.5/libmpdemux-ogg-include.patch
+packages/mplayer/mplayer-atty-1.1.5/sdl.patch
+packages/mplayer/mplayer-atty_1.1.5.bb
+packages/mplayer/mplayer_1.0pre7.bb
+packages/mplayer/mplayer_1.0pre8.bb
============================================================
--- packages/mplayer/files/disable-executable-stack-test.patch	ce1b9d60646b6c8a9407d926b92371d3f80fbb0a
+++ packages/mplayer/files/disable-executable-stack-test.patch	ce1b9d60646b6c8a9407d926b92371d3f80fbb0a
@@ -0,0 +1,30 @@
+Removes the "noexecstack" check from configure so we don't end up with:
+
+     mplayer: error while loading shared libraries: libmad.so.0: cannot 
+     enable executable stack as shared object requires: Error 14
+
+at runtime.
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- MPlayer-1.0pre8/configure~disable-executable-stack-test
++++ MPlayer-1.0pre8/configure
+@@ -7193,15 +7193,7 @@
+ fi
+ 
+ echocheck "compiler support for noexecstack"
+-cat > $TMPC <<EOF
+-int main(void) { return 0; }
+-EOF
+-if cc_check -Wl,-z,noexecstack ; then
+-  _ld_extra="-Wl,-z,noexecstack $_ld_extra"
+-  echores "yes"
+-else
+-  echores "no"
+-fi
++echores "no"
+ 
+ echocheck "ftello()"
+ # if we don't have ftello use the osdep/ compatibility module
============================================================
--- packages/mplayer/files/makefile-nostrip.patch	7e191a9ab89499e122b1422609ec9e39f383f8b2
+++ packages/mplayer/files/makefile-nostrip.patch	7e191a9ab89499e122b1422609ec9e39f383f8b2
@@ -0,0 +1,22 @@
+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
+@@ -430,7 +430,7 @@ endif
+ 		fi ; \
+ 	done
+ ifeq ($(MENCODER),yes)
+-	$(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG_MENCODER) $(BINDIR)/$(PRG_MENCODER)
++	$(INSTALL) -m 755 $(PRG_MENCODER) $(BINDIR)/$(PRG_MENCODER)
+ 	for i in $(MAN_LANG); do \
+ 		if test "$$i" = en ; then \
+ 			cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1 ; \
============================================================
--- packages/mplayer/mplayer_1.0rc1.bb	c2e64d43ef6073b8b870c254748ec449099752bb
+++ packages/mplayer/mplayer_1.0rc1.bb	c2e64d43ef6073b8b870c254748ec449099752bb
@@ -0,0 +1,183 @@
+DESCRIPTION = "Open Source multimedia player."
+SECTION = "multimedia"
+PRIORITY = "optional"
+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 = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc1.tar.bz2 \
+           file://vo_w100.c \
+           file://vo_w100_api.h \
+           file://vo_w100_fb.h \
+           file://Makefile.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=1 \
+           file://pld-onlyarm5.patch;patch=1 \
+           file://makefile-nostrip.patch;patch=1"
+
+SRC_URI_append_collie = " file://disable-executable-stack-test.patch;patch=1"
+PACKAGE_ARCH_mplayer_collie = "collie"
+PACKAGE_ARCH_mencoder_collie = "collie"
+
+RCONFLICTS_${PN} = "mplayer-atty"
+RREPLACES_${PN} = "mplayer-atty"
+PR = "r0"
+
+PARALLEL_MAKE = ""
+
+DEPENDS_append_c7x0 = " sharp-aticore-oss "
+
+S = "${WORKDIR}/MPlayer-1.0rc1"
+
+PACKAGES =+ "mencoder"
+
+FILES_${PN} = "${bindir}/mplayer"
+FILES_mencoder = "${bindir}/mencoder"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = " \
+        --prefix=/usr \
+	--mandir=${mandir} \
+        --target=${TARGET_SYS} \
+	\
+	--enable-mencoder \
+	--disable-gui \
+	--enable-largefiles \
+	--disable-linux-devfs \
+	--disable-lirc \
+	--disable-lircc \
+        --disable-joystick \
+        --disable-vm \
+        --disable-xf86keysym \
+	--disable-tv \
+        --disable-tv-v4l2 \
+        --disable-tv-bsdbt848 \
+	--enable-rtc \
+        --enable-network \
+        --disable-winsock2 \
+	--disable-smb \
+        --disable-live \
+        --disable-dvdread \
+        --disable-mpdvdkit \
+        --disable-cdparanoia \
+        --enable-freetype \
+        --disable-unrarlib \
+        --disable-menu \
+        --enable-sortsub \
+        --disable-fribidi \
+        --disable-enca \
+        --disable-macosx \
+        --disable-macosx-finder-support \
+        --disable-macosx-bundle \
+        --disable-ftp \
+        --disable-vstream \
+        \
+        --disable-gif \
+        --enable-png \
+        --enable-jpeg \
+        --disable-libcdio \
+        --enable-liblzo \
+	--disable-win32 \
+        --disable-qtx \
+        --disable-xanim \
+        --disable-real \
+        --disable-xvid \
+        --disable-x264 \
+        \
+        --disable-libavutil_so \
+        --disable-libavcodec_so \
+        --disable-libavformat_so \
+        --disable-libpostproc_so \
+        --disable-libfame \
+	\
+	--enable-tremor-low \
+        \
+        --disable-speex \
+        --disable-theora \
+        --disable-faac \
+        --disable-ladspa \
+        --disable-libdv \
+        --enable-mad \
+        --disable-toolame \
+        --disable-twolame \
+        --disable-xmms \
+	--disable-mp3lib \
+        --disable-libdts \
+        --enable-libmpeg2 \
+        --disable-musepack \
+        --disable-amr_nb \
+        --disable-amr_nb-fixed \
+        --disable-amr_wb \
+	\
+        --disable-gl \
+        --disable-dga \
+        --disable-vesa \
+        --disable-svga \
+	--enable-sdl \
+        --disable-aa \
+        --disable-caca \
+        --disable-ggi \
+        --disable-ggiwmh \
+        --disable-directx \
+        --disable-dxr2 \
+        --disable-dxr3 \
+        --disable-dvb \
+        --disable-dvbhead \
+        --disable-mga \
+        --disable-xmga \
+        --disable-xv \
+        --disable-xvmc \
+        --disable-vm \
+        --disable-xinerama \
+        --disable-x11 \
+	--enable-fbdev \
+        --disable-mlib \
+        --disable-3dfx \
+        --disable-tdfxfb \
+        --disable-s3fb \
+        --disable-directfb \
+        --disable-zr \
+        --disable-bl \
+        --disable-tdfxvid \
+        --disable-tga \
+        --disable-pnm \
+        --disable-md5sum \
+        \
+        --enable-alsa \
+        --enable-ossaudio \
+        --disable-arts \
+        --disable-esd \
+        --disable-polyp \
+        --disable-jack \
+        --disable-openal \
+        --disable-nas \
+        --disable-sgiaudio \
+        --disable-sunaudio \
+        --disable-win32waveout \
+        --enable-select \
+        \
+        --disable-runtime-cpudetection \
+        "
+
+EXTRA_OECONF_append_c7x0 = " --enable-w100 "
+
+do_configure() {
+	cp ${WORKDIR}/vo_w100.c ${S}/libvo
+	cp ${WORKDIR}/vo_w100_api.h ${S}/libvo
+	cp ${WORKDIR}/vo_w100_fb.h ${S}/libvo
+
+	sed -i 's|/usr/include|${STAGING_INCDIR}|g' ${S}/configure
+	sed -i 's|/usr/lib|${STAGING_LIBDIR}|g' ${S}/configure
+	sed -i 's|/usr/\S*include[\w/]*||g' ${S}/configure
+	sed -i 's|/usr/\S*lib[\w/]*||g' ${S}/configure
+
+        ./configure ${EXTRA_OECONF}
+}
+
+do_compile () {
+	oe_runmake
+}
+
============================================================
--- packages/mplayer/files/Makefile.patch	6ae1eb74eb1fc8fa979fcda1faeaf8103f40a999
+++ packages/mplayer/files/Makefile.patch	d280c2462ddfd9742deeff069234893541c65574
@@ -1,11 +1,13 @@
---- mplayer_20060519/Makefile.orig	2006-05-30 09:32:23.000000000 +0100
-+++ mplayer_20060519/Makefile	2006-05-30 09:34:07.000000000 +0100
-@@ -438,7 +438,7 @@
- 	$(CC) -DCODECS2HTML codec-cfg.c mp_msg.o -o $@
+Index: MPlayer-1.0rc1/Makefile
+===================================================================
+--- MPlayer-1.0rc1.orig/Makefile
++++ MPlayer-1.0rc1/Makefile
+@@ -399,7 +399,7 @@ osdep/mplayer-rc.o: osdep/mplayer.rc
+ 	windres -o $@ osdep/mplayer.rc
  
- $(PRG_CFG): codec-cfg.c codec-cfg.h help_mp.h
--	$(HOST_CC) $(HOST_CFLAGS) -I. codec-cfg.c -o $(PRG_CFG) \
-+	$(BUILD_CC) -Ilibmpdemux -Iloader -Ilibvo -I. codec-cfg.c -o $(PRG_CFG) \
- 	-DCODECS2HTML $(EXTRA_LIB) $(EXTRA_INC)
+ codec-cfg: codec-cfg.c codec-cfg.h help_mp.h
+-	$(HOST_CC) -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 > $@
- install: $(ALL_PRG)
============================================================
--- packages/mplayer/files/w100-mplayer.patch	85fb301c62127f92f6fc40768d5e67f405bd67f1
+++ packages/mplayer/files/w100-mplayer.patch	74140fd2e25ef3370f882b4069f45ead258ff924
@@ -1,6 +1,8 @@
---- mplayer_20060519/mplayer.c.orig	2006-05-30 12:31:01.000000000 +0100
-+++ mplayer_20060519/mplayer.c	2006-05-30 12:33:41.000000000 +0100
-@@ -628,6 +628,18 @@
+Index: MPlayer-1.0rc1/mplayer.c
+===================================================================
+--- MPlayer-1.0rc1.orig/mplayer.c
++++ MPlayer-1.0rc1/mplayer.c
+@@ -807,6 +807,17 @@ static void exit_sighandler(int x){
    exit_player(NULL);
  }
  
@@ -15,11 +17,10 @@
 +  }
 +}
 +
-+
- //extern void write_avi_header_1(FILE *f,int fcc,float fps,int width,int height);
+ extern void mp_input_register_options(m_config_t* cfg);
  
- extern void mp_input_register_options(m_config_t* cfg);
-@@ -2732,6 +2744,9 @@
+ #include "mixer.h"
+@@ -3216,6 +3227,9 @@ current_module = NULL;
  #endif
  #endif

More information about the Openembedded-commits mailing list