From a2bf491e95431ecae6399e87402033b48a9dbcd5 Mon Sep 17 00:00:00 2001 From: Ricardo Salveti de Araujo Date: Tue, 10 Nov 2009 14:16:15 -0300 Subject: [PATCH 085/118] mplayer-1.0maemo0: adding recipe Signed-off-by: Ricardo Salveti de Araujo --- .../mplayer/add_ffmpeg_as_afm_as_default.patch | 13 ++++ .../mplayer/build_cc_instead_of_host_cc.patch | 13 ++++ .../mplayer/fix_asm_compile_problem_n770.patch | 11 +++ .../maemo/mplayer/fix_hardcoded_usr_include.patch | 19 +++++ recipes/maemo/mplayer/fix_vo_nokia_compile.patch | 12 +++ .../maemo/mplayer/include_dbus_glib_depends.patch | 36 +++++++++ .../mplayer/remove_usr_include_from_cflags.patch | 30 ++++++++ recipes/maemo/mplayer_1.0maemo0.bb | 75 ++++++++++++++++++++ 8 files changed, 209 insertions(+), 0 deletions(-) create mode 100644 recipes/maemo/mplayer/add_ffmpeg_as_afm_as_default.patch create mode 100644 recipes/maemo/mplayer/build_cc_instead_of_host_cc.patch create mode 100644 recipes/maemo/mplayer/fix_asm_compile_problem_n770.patch create mode 100644 recipes/maemo/mplayer/fix_hardcoded_usr_include.patch create mode 100644 recipes/maemo/mplayer/fix_vo_nokia_compile.patch create mode 100644 recipes/maemo/mplayer/include_dbus_glib_depends.patch create mode 100644 recipes/maemo/mplayer/remove_usr_include_from_cflags.patch create mode 100644 recipes/maemo/mplayer_1.0maemo0.bb diff --git a/recipes/maemo/mplayer/add_ffmpeg_as_afm_as_default.patch b/recipes/maemo/mplayer/add_ffmpeg_as_afm_as_default.patch new file mode 100644 index 0000000..b943ea9 --- /dev/null +++ b/recipes/maemo/mplayer/add_ffmpeg_as_afm_as_default.patch @@ -0,0 +1,13 @@ +Index: trunk/debian/mplayer.conf +=================================================================== +--- trunk.orig/debian/mplayer.conf 2008-01-24 14:57:27.000000000 -0300 ++++ trunk/debian/mplayer.conf 2008-01-24 14:57:57.000000000 -0300 +@@ -1,7 +1,7 @@ + ao=gst,sdl + vo=nokia770,xv,sdl + framedrop=yes +-afm=dspmp3,libmad ++afm=ffmpeg,dspmp3,libmad + noslices=true + monitorpixelaspect=1 + fs=yes diff --git a/recipes/maemo/mplayer/build_cc_instead_of_host_cc.patch b/recipes/maemo/mplayer/build_cc_instead_of_host_cc.patch new file mode 100644 index 0000000..7ee2245 --- /dev/null +++ b/recipes/maemo/mplayer/build_cc_instead_of_host_cc.patch @@ -0,0 +1,13 @@ +Index: trunk/Makefile +=================================================================== +--- trunk.orig/Makefile 2008-01-02 17:03:55.000000000 -0300 ++++ trunk/Makefile 2008-01-02 17:05:03.000000000 -0300 +@@ -401,7 +401,7 @@ + windres -o $@ osdep/mplayer.rc + + 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 > $@ diff --git a/recipes/maemo/mplayer/fix_asm_compile_problem_n770.patch b/recipes/maemo/mplayer/fix_asm_compile_problem_n770.patch new file mode 100644 index 0000000..9a3ebb8 --- /dev/null +++ b/recipes/maemo/mplayer/fix_asm_compile_problem_n770.patch @@ -0,0 +1,11 @@ +diff -Naur trunk/libswscale_nokia770/arm_colorconv.S trunk-new/libswscale_nokia770/arm_colorconv.S +--- trunk/libswscale_nokia770/arm_colorconv.S 2008-04-22 20:30:18.000000000 -0300 ++++ trunk-new/libswscale_nokia770/arm_colorconv.S 2008-04-22 20:29:01.000000000 -0300 +@@ -143,6 +143,7 @@ + .endm + + .if \USE_ARMV6 ++.arch armv6 + + .macro CONVERT_8_PIXELS_MACROBLOCK_1 DST_REG1, DST_REG2, FLAG1, FLAG2, PLD_FLAG + .if \FLAG1 == 0 diff --git a/recipes/maemo/mplayer/fix_hardcoded_usr_include.patch b/recipes/maemo/mplayer/fix_hardcoded_usr_include.patch new file mode 100644 index 0000000..185b51e --- /dev/null +++ b/recipes/maemo/mplayer/fix_hardcoded_usr_include.patch @@ -0,0 +1,19 @@ +Index: trunk/gmplauncher/src/Makefile.am +=================================================================== +--- trunk.orig/gmplauncher/src/Makefile.am 2008-01-02 17:03:55.000000000 -0300 ++++ trunk/gmplauncher/src/Makefile.am 2008-01-02 17:05:28.000000000 -0300 +@@ -3,10 +3,10 @@ + INCLUDES = \ + -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ + -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ +- -I/usr/include/dbus-1.0 \ +- -I/usr/lib/dbus-1.0/include \ +- -I/usr/include/glib-2.0 \ +- -I/usr/lib/glib-2.0/include \ ++ -I$(includedir)/dbus-1.0 \ ++ -I$(libdir)/dbus-1.0/include \ ++ -I$(includedir)/glib-2.0 \ ++ -I$(libdir)/glib-2.0/include \ + @PACKAGE_CFLAGS@ + + LIBS += -losso -ldbus-glib-1 -ldbus-1 -lglib-2.0 -lhildonfm diff --git a/recipes/maemo/mplayer/fix_vo_nokia_compile.patch b/recipes/maemo/mplayer/fix_vo_nokia_compile.patch new file mode 100644 index 0000000..b8187b4 --- /dev/null +++ b/recipes/maemo/mplayer/fix_vo_nokia_compile.patch @@ -0,0 +1,12 @@ +Index: trunk/libvo/vo_nokia770.c +=================================================================== +--- trunk.orig/libvo/vo_nokia770.c 2008-01-02 17:03:55.000000000 -0300 ++++ trunk/libvo/vo_nokia770.c 2008-01-02 17:05:17.000000000 -0300 +@@ -182,6 +182,7 @@ + /* X11 helper functions are here */ + /******************************************************************************/ + ++static int set_fb_overlay_region(int x, int y, int w, int h); + extern void mplayer_put_key( int code ); + #include "osdep/keycodes.h" + diff --git a/recipes/maemo/mplayer/include_dbus_glib_depends.patch b/recipes/maemo/mplayer/include_dbus_glib_depends.patch new file mode 100644 index 0000000..b7beab6 --- /dev/null +++ b/recipes/maemo/mplayer/include_dbus_glib_depends.patch @@ -0,0 +1,36 @@ +Index: trunk/gmplauncher/configure.in +=================================================================== +--- trunk.orig/gmplauncher/configure.in 2008-01-02 17:06:39.000000000 -0300 ++++ trunk/gmplauncher/configure.in 2008-01-02 17:07:06.000000000 -0300 +@@ -15,6 +15,16 @@ + AC_SUBST(PACKAGE_CFLAGS) + AC_SUBST(PACKAGE_LIBS) + ++pkg_modules="dbus" ++PKG_CHECK_MODULES(PACKAGE, [$pkg_modules]) ++AC_SUBST(PACKAGE_CFLAGS) ++AC_SUBST(PACKAGE_LIBS) ++ ++pkg_modules="glib-2.0" ++PKG_CHECK_MODULES(PACKAGE, [$pkg_modules]) ++AC_SUBST(PACKAGE_CFLAGS) ++AC_SUBST(PACKAGE_LIBS) ++ + GETTEXT_PACKAGE=gmplauncher + AC_SUBST(GETTEXT_PACKAGE) + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.]) +Index: trunk/gmplauncher/src/Makefile.am +=================================================================== +--- trunk.orig/gmplauncher/src/Makefile.am 2008-01-02 17:06:55.000000000 -0300 ++++ trunk/gmplauncher/src/Makefile.am 2008-01-02 17:07:18.000000000 -0300 +@@ -3,10 +3,6 @@ + INCLUDES = \ + -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ + -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ +- -I/usr/include/dbus-1.0 \ +- -I/usr/lib/dbus-1.0/include \ +- -I/usr/include/glib-2.0 \ +- -I/usr/lib/glib-2.0/include \ + @PACKAGE_CFLAGS@ + + LIBS += -losso -ldbus-glib-1 -ldbus-1 -lglib-2.0 -lhildonfm diff --git a/recipes/maemo/mplayer/remove_usr_include_from_cflags.patch b/recipes/maemo/mplayer/remove_usr_include_from_cflags.patch new file mode 100644 index 0000000..e4b1481 --- /dev/null +++ b/recipes/maemo/mplayer/remove_usr_include_from_cflags.patch @@ -0,0 +1,30 @@ +Index: trunk/configure +=================================================================== +--- trunk.orig/configure 2008-01-02 17:03:55.000000000 -0300 ++++ trunk/configure 2008-01-02 17:04:58.000000000 -0300 +@@ -59,6 +59,7 @@ + echo >> "$TMPLOG" + cat "$1" >> "$TMPLOG" + echo >> "$TMPLOG" ++ _inc_extra=`echo $_inc_extra | sed 's: -I/usr/include \?: :'` + echo "$_cc $CFLAGS $_inc_extra $_ld_static $_ld_extra -o $TMPO $@" >> "$TMPLOG" + rm -f "$TMPO" + $_cc $CFLAGS $_inc_extra $_ld_static $_ld_extra -o "$TMPO" "$@" >> "$TMPLOG" 2>&1 +@@ -7198,7 +7199,6 @@ + fi #if test "$_gui" + # --------------- GUI specific tests end ------------------- + +- + if test "$_charset" = "noconv" ; then + _charset="" + elif test -z "$_charset" ; then +@@ -7476,6 +7476,9 @@ + echores "$_maemo" + fi + ++# Removing /usr/include ++_inc_extra=`echo $_inc_extra | sed 's: -I/usr/include \?: :'` ++ + ############################################################################# + echo "Creating config.mak" + cat > config.mak << EOF diff --git a/recipes/maemo/mplayer_1.0maemo0.bb b/recipes/maemo/mplayer_1.0maemo0.bb new file mode 100644 index 0000000..47a6c44 --- /dev/null +++ b/recipes/maemo/mplayer_1.0maemo0.bb @@ -0,0 +1,75 @@ +DESCRIPTION = "Open Source multimedia player." +SECTION = "multimedia" +PRIORITY = "optional" +HOMEPAGE = "https://garage.maemo.org/projects/mplayer/" +LICENSE = "GPL" +PR = "r0" + +inherit autotools + +EXTRA_OECONF = "--disable-mencoder \ + --disable-ossaudio \ + --disable-pnm \ + --disable-tv \ + --disable-dvb \ + --disable-dvbhead \ + --disable-tga \ + --disable-mpdvdkit \ + --enable-mp3lib \ + --disable-vcd \ + --disable-mad \ + --disable-man \ + --disable-termcap \ + --disable-bitmap-font \ + --disable-libavcodec_mpegaudio_hp \ + --disable-fbdev \ + --enable-liba52 \ + --enable-faad-internal \ + --enable-menu \ + --enable-md5sum \ + --enable-freetype \ + --enable-ass \ + --enable-esd \ + --enable-jpeg \ + --enable-png \ + --enable-sdl \ + --enable-gstreamer \ + --enable-mad \ + --enable-theora \ + --enable-xv \ + --disable-faad-fixed \ + --enable-alsa \ + --with-x11libdir=${STAGING_INCDIR}/X11" + +DEPENDS += "virtual/libsdl xsp libmad zlib libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses lame libxv virtual/libx11 atk audiofile cairo dbus dbus-glib osso-esd freetype gstreamer gtk+ libhildonfm libmad libogg libosso pango libtheora libxext libxml2 mesa xsp faac" +RDEPENDS += "libtheora" + +SRC_URI = "svn://garage.maemo.org/svn/mplayer;module=trunk;proto=https;rev=302 \ + file://remove_usr_include_from_cflags.patch;patch=1 \ + file://build_cc_instead_of_host_cc.patch;patch=1 \ + file://fix_vo_nokia_compile.patch;patch=1 \ + file://include_dbus_glib_depends.patch;patch=1 \ + file://add_ffmpeg_as_afm_as_default.patch;patch=1 \ + file://fix_asm_compile_problem_n770.patch;patch=1" +S = "${WORKDIR}/trunk" + +do_configure() { + ./configure --target=${TARGET_SYS} --prefix=${prefix} --bindir=${bindir} --datadir=${datadir} --libdir=${libdir} --mandir=${mandir} --confdir=${sysconfdir}/mplayer ${EXTRA_OECONF} +# cd gmplauncher && ./autogen.sh --target=${TARGET_SYS} --prefix=${prefix} --bindir=${bindir} --datadir=${datadir} --libdir=${libdir} --mandir=${mandir} --host=${HOST_SYS} && cd .. +} + +do_compile_append() { +# make -C gmplauncher +} + +do_install_append() { + install -d ${D}/${sysconfdir}/mplayer + install -m 644 ${S}/debian/mplayer.conf ${D}/${sysconfdir}/mplayer + install -m 644 ${S}/debian/menu.conf ${D}/${sysconfdir}/mplayer + +# make prefix=${prefix} -C gmplauncher install + +# for size in 26x26 48x48 64x64 ; do +# uudecode ${S}/debian/mplayer$$size.png.uue -o ${D}/${datadir}/icons/hicolor/${size}/apps/mplayer.png +# done +} -- 1.6.3.3