From 67995a2671f08f07a1fb03e52945908c05d2fa5b Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Sun, 12 Sep 2010 17:12:28 +0200 Subject: mplayer_git: fix omapfb patchset and bump PR omapfb.patch was rebased and added as mplayer-git_omapfb.patch vo_omapfb.c had to be patched due to API change, hence the omapfb_control_arguments.patch Thanks to kergoth(on #oe on Freenode) for help on how to patch a file that is copied only in do_configure_prepend which comes after do_patch The first attempt : file://omapfb_control_arguments.patch;patchdir=${WORKDIR} resulted in a strange behaviour such as: NOTE: Handling BitBake files: \ (0675/7073) [ 9 %]NOTE: :maximum recursion depth exceeded while evaluating: ${PN}-${EXTENDPE}${PV}-${PR} NOTE: :maximum recursion depth exceeded while evaluating: ${TMPDIR}/work/${MULTIMACH_TARGET_SYS}/${PF} so I used patchdir=.. as advised: you could try using patchdir=.. Thanks a lot for all the help. --- recipes/mplayer/mplayer/mplayer-git_omapfb.patch | 33 ++++++++++++++++++++++ .../mplayer/mplayer/omapfb_control_arguments.patch | 13 +++++++++ recipes/mplayer/mplayer_git.bb | 5 ++-- 3 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 recipes/mplayer/mplayer/mplayer-git_omapfb.patch create mode 100644 recipes/mplayer/mplayer/omapfb_control_arguments.patch (limited to 'recipes/mplayer') diff --git a/recipes/mplayer/mplayer/mplayer-git_omapfb.patch b/recipes/mplayer/mplayer/mplayer-git_omapfb.patch new file mode 100644 index 0000000000..f5d41e937e --- /dev/null +++ b/recipes/mplayer/mplayer/mplayer-git_omapfb.patch @@ -0,0 +1,33 @@ +Index: git/Makefile +=================================================================== +--- git.orig/Makefile 2010-09-12 21:47:39.272215523 +0200 ++++ git/Makefile 2010-09-12 21:49:13.359100591 +0200 +@@ -538,7 +538,7 @@ + SRCS_MPLAYER-$(DXR2) += libao2/ao_dxr2.c libvo/vo_dxr2.c + SRCS_MPLAYER-$(DXR3) += libvo/vo_dxr3.c + SRCS_MPLAYER-$(ESD) += libao2/ao_esd.c +-SRCS_MPLAYER-$(FBDEV) += libvo/vo_fbdev.c libvo/vo_fbdev2.c ++SRCS_MPLAYER-$(FBDEV) += libvo/vo_fbdev.c libvo/vo_fbdev2.c libvo/vo_omapfb.c libvo/yuv.S + SRCS_MPLAYER-$(GGI) += libvo/vo_ggi.c + SRCS_MPLAYER-$(GIF) += libvo/vo_gif89a.c + SRCS_MPLAYER-$(GL) += libvo/gl_common.c libvo/vo_gl.c \ +Index: git/libvo/video_out.c +=================================================================== +--- git.orig/libvo/video_out.c 2010-09-12 21:47:49.882156069 +0200 ++++ git/libvo/video_out.c 2010-09-12 21:49:13.359100591 +0200 +@@ -101,6 +101,7 @@ + extern struct vo_driver video_out_bl; + extern struct vo_driver video_out_fbdev; + extern struct vo_driver video_out_fbdev2; ++extern struct vo_driver video_out_omapfb; + extern struct vo_driver video_out_svga; + extern struct vo_driver video_out_png; + extern struct vo_driver video_out_ggi; +@@ -202,6 +203,7 @@ + #ifdef CONFIG_FBDEV + &video_out_fbdev, + &video_out_fbdev2, ++ &video_out_omapfb, + #endif + #ifdef CONFIG_SVGALIB + &video_out_svga, diff --git a/recipes/mplayer/mplayer/omapfb_control_arguments.patch b/recipes/mplayer/mplayer/omapfb_control_arguments.patch new file mode 100644 index 0000000000..04351112b0 --- /dev/null +++ b/recipes/mplayer/mplayer/omapfb_control_arguments.patch @@ -0,0 +1,13 @@ +Index: mplayer-0.0+1.0rc4+gitr0+d1c686f6a63c31276b0811baf7c78aa6f4c6c6a6-r5/vo_omapfb.c +=================================================================== +--- mplayer-0.0+1.0rc4+gitr0+d1c686f6a63c31276b0811baf7c78aa6f4c6c6a6-r5.orig/vo_omapfb.c 2010-09-12 22:42:52.589660557 +0200 ++++ mplayer-0.0+1.0rc4+gitr0+d1c686f6a63c31276b0811baf7c78aa6f4c6c6a6-r5/vo_omapfb.c 2010-09-12 22:43:01.759065169 +0200 +@@ -556,7 +556,7 @@ + } + + +-static int control(uint32_t request, void *data, ...) ++static int control(uint32_t request, void *data) + { + switch (request) { + case VOCTRL_QUERY_FORMAT: diff --git a/recipes/mplayer/mplayer_git.bb b/recipes/mplayer/mplayer_git.bb index b9cb16cdda..afeb5b3480 100644 --- a/recipes/mplayer/mplayer_git.bb +++ b/recipes/mplayer/mplayer_git.bb @@ -12,9 +12,10 @@ SRC_URI = "git://repo.or.cz/mplayer/glamo.git;protocol=git;branch=master \ " SRC_URI_append_armv7a = " \ - file://omapfb.patch \ + file://mplayer-git_omapfb.patch \ file://vo_omapfb.c \ file://yuv.S \ + file://omapfb_control_arguments.patch;patchdir=.. \ " # This is required for the collie machine only as all stacks in that @@ -35,7 +36,7 @@ RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" PV = "0.0+1.0rc4+gitr${SRCPV}" -PR = "r4" +PR = "r5" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_shr = "2" -- cgit 1.2.3-korg