[oe-commits] org.oe.dev mplayer_0.0+1.0rc1.bb : add latest version of mplayer, fixing versioning
xora commit
openembedded-commits at lists.openembedded.org
Wed Dec 6 09:38:10 UTC 2006
mplayer_0.0+1.0rc1.bb : add latest version of mplayer, fixing versioning
to meet OE policy.
A couple of patches have been rediffed and two Makefile patches dropped as
what they did is now in the Makefiles in question.
Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 04f59b36383a6cbb3c7e79ded0167ba1b7839430
ViewMTN: http://monotone.openembedded.org/revision.psp?id=04f59b36383a6cbb3c7e79ded0167ba1b7839430
Files:
1
packages/mplayer/files/libmpcodecs-ogg-include.patch
packages/mplayer/files/libmpdemux-ogg-include.patch
packages/mplayer/mplayer_1.0pre8.bb
packages/mplayer/mplayer_0.0+1.0rc1.bb
packages/mplayer/files/Makefile.patch
packages/mplayer/files/w100-mplayer.patch
Diffs:
#
# mt diff -r0ababc17dd30226603bcedb3e3842659c8fbc6af -r04f59b36383a6cbb3c7e79ded0167ba1b7839430
#
#
#
# delete "packages/mplayer/files/libmpcodecs-ogg-include.patch"
#
# delete "packages/mplayer/files/libmpdemux-ogg-include.patch"
#
# delete "packages/mplayer/mplayer_1.0pre8.bb"
#
# add_file "packages/mplayer/mplayer_0.0+1.0rc1.bb"
# content [7c0eaf68f4315345a9330f17072b1020788178d6]
#
# patch "packages/mplayer/files/Makefile.patch"
# from [1f161155685f3634d7e3f6ef5802d30137abc22b]
# to [d280c2462ddfd9742deeff069234893541c65574]
#
# patch "packages/mplayer/files/w100-mplayer.patch"
# from [85fb301c62127f92f6fc40768d5e67f405bd67f1]
# to [74140fd2e25ef3370f882b4069f45ead258ff924]
#
============================================================
--- packages/mplayer/mplayer_0.0+1.0rc1.bb 7c0eaf68f4315345a9330f17072b1020788178d6
+++ packages/mplayer/mplayer_0.0+1.0rc1.bb 7c0eaf68f4315345a9330f17072b1020788178d6
@@ -0,0 +1,182 @@
+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 \
+ ${SOURCEFORGE_MIRROR}/libw100/mplayer-imageon.patch;patch=1 \
+ file://imageon-video_out.patch;patch=1"
+
+RCONFLICTS_${PN} = "mplayer-atty"
+RREPLACES_${PN} = "mplayer-atty"
+PR = "r4"
+
+PARALLEL_MAKE = ""
+
+DEPENDS_append_c7x0 = " sharp-aticore-oss libw100 "
+DEPENDS_append_hx4700 = " libw100 "
+
+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 --enable-imageon "
+EXTRA_OECONF_append_hx4700 = " --enable-imageon "
+
+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 1f161155685f3634d7e3f6ef5802d30137abc22b
+++ packages/mplayer/files/Makefile.patch d280c2462ddfd9742deeff069234893541c65574
@@ -1,15 +1,13 @@
-Index: MPlayer-1.0pre8/Makefile
+Index: MPlayer-1.0rc1/Makefile
===================================================================
---- MPlayer-1.0pre8.orig/Makefile
-+++ MPlayer-1.0pre8/Makefile
-@@ -438,8 +438,8 @@ codecs2html: mp_msg.o
- $(CC) -DCODECS2HTML codec-cfg.c mp_msg.o -o $@
+--- 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) \
-- -DCODECS2HTML $(EXTRA_LIB) $(EXTRA_INC)
-+ $(BUILD_CC) -Ilibmpdemux -Iloader -Ilibvo -I. codec-cfg.c -o $(PRG_CFG) \
-+ -DCODECS2HTML
+ 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)
- ifeq ($(VIDIX),yes)
============================================================
--- 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