[oe-commits] Martin Jansa : mplayer: remove patches applied upstream

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: 92d236c6d8caf0eafda26f4880df74556c9d91ef
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=92d236c6d8caf0eafda26f4880df74556c9d91ef

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Thu Nov 19 09:24:47 2009 +0100

mplayer: remove patches applied upstream

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 ...rol-prototype-to-match-the-one-in-video_o.patch |   25 ----------
 .../files/0002-remove-libaf-af_lavcac3enc.c.patch  |   49 --------------------
 recipes/mplayer/mplayer_git.bb                     |    9 +--
 3 files changed, 3 insertions(+), 80 deletions(-)

diff --git a/recipes/mplayer/files/0001-Modify-control-prototype-to-match-the-one-in-video_o.patch b/recipes/mplayer/files/0001-Modify-control-prototype-to-match-the-one-in-video_o.patch
deleted file mode 100644
index e7e50c9..0000000
--- a/recipes/mplayer/files/0001-Modify-control-prototype-to-match-the-one-in-video_o.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From abc6589edec24a8151d53741c2fe479b983e1f46 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa at gmail.com>
-Date: Sun, 1 Nov 2009 21:58:21 +0100
-Subject: [PATCH 1/2] Modify control() prototype to match the one in video_out_internal.h
-
----
- libvo/vo_glamo.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/libvo/vo_glamo.c b/libvo/vo_glamo.c
-index f528649..e53d523 100644
---- a/libvo/vo_glamo.c
-+++ b/libvo/vo_glamo.c
-@@ -182,7 +182,7 @@ static int glamo_window(mp_win_t *win)
- 	return VO_TRUE;
- }
- 
--static int control(uint32_t request, void *data, ...)
-+static int control(uint32_t request, void *data)
- {
- 	switch (request) {
- 	case VOCTRL_QUERY_FORMAT:
--- 
-1.6.5.2
-
diff --git a/recipes/mplayer/files/0002-remove-libaf-af_lavcac3enc.c.patch b/recipes/mplayer/files/0002-remove-libaf-af_lavcac3enc.c.patch
deleted file mode 100644
index 9359cd5..0000000
--- a/recipes/mplayer/files/0002-remove-libaf-af_lavcac3enc.c.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 73f1df1d1719dcdf6c2989e75d4ee87d44141eaa Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa at gmail.com>
-Date: Mon, 2 Nov 2009 09:33:46 +0100
-Subject: [PATCH 2/2] remove libaf/af_lavcac3enc.c
-
----
- Makefile |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index ce4999c..213be06 100644
---- a/Makefile
-+++ b/Makefile
-@@ -138,7 +138,7 @@ SRCS_COMMON-$(LIBAVCODEC)            += av_opts.c \
-                                         libmpcodecs/vf_uspp.c \
- 
- # These filters use private headers and do not work with shared libavcodec.
--SRCS_COMMON-$(LIBAVCODEC_INTERNALS)  += libaf/af_lavcac3enc.c \
-+SRCS_COMMON-$(LIBAVCODEC_INTERNALS)  += \
-                                         libmpcodecs/vf_fspp.c \
-                                         libmpcodecs/vf_geq.c \
-                                         libmpcodecs/vf_mcdeint.c \
--- 
-1.6.5.2
-
-From d194f944b7fd07ec77987a91df17732a4a9a47cd Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa at gmail.com>
-Date: Mon, 2 Nov 2009 09:38:53 +0100
-Subject: [PATCH] remove libaf/af_lavcac3enc.c
-
----
- Makefile |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 213be06..25c4577 100644
---- a/Makefile
-+++ b/Makefile
-@@ -372,7 +372,6 @@ SRCS_COMMON = asxparser.c \
-               libaf/af_tools.c \
-               libaf/af_volnorm.c \
-               libaf/af_volume.c \
--              libaf/af_lavcac3enc.c \
-               libaf/filter.c \
-               libaf/format.c \
-               libaf/reorder_ch.c \
--- 
-1.6.5.2
-
diff --git a/recipes/mplayer/mplayer_git.bb b/recipes/mplayer/mplayer_git.bb
index d33a14d..984227b 100644
--- a/recipes/mplayer/mplayer_git.bb
+++ b/recipes/mplayer/mplayer_git.bb
@@ -7,10 +7,8 @@ DEPENDS = "live555 libdvdread libtheora virtual/libsdl ffmpeg xsp zlib libpng jp
 
 RDEPENDS = "mplayer-common"
 LICENSE = "GPL"
-SRC_URI = "git://repo.or.cz/mplayer.git;protocol=git;branch=tmp_build"
+SRC_URI = "git://repo.or.cz/mplayer.git;protocol=git;branch=master"
 SRC_URI_om-gta02 = "git://repo.or.cz/mplayer/glamo.git;protocol=git;branch=master \
-   file://0001-Modify-control-prototype-to-match-the-one-in-video_o.patch;patch=1 \
-   file://0002-remove-libaf-af_lavcac3enc.c.patch;patch=1 \
    file://makefile-nostrip-svn.patch;patch=1 \
    "
 
@@ -31,8 +29,8 @@ SRC_URI_append_armv7a = " \
 # ie. for all armv4 machines.
 SRC_URI_append_collie = "file://disable-executable-stack-test.patch;patch=1"
 
-SRCREV_om-gta02 = "dd07d2721934bc664f69af36e20565d6eac27f7a"
-SRCREV = "8bbb79c03a594e452fb9109dd6fda781d390a798"
+SRCREV_om-gta02 = "5519d0dfd3f9504f24aa9fe154f831bb718cbfc3"
+SRCREV = "e5bcd70bc5b0557635ae51c7093f0e887493d4ba"
 
 PACKAGE_ARCH_collie = "collie"
 PACKAGE_ARCH_c7x0 = "c7x0"
@@ -46,7 +44,6 @@ RREPLACES_${PN} = "mplayer-atty"
 PV = "0.0+1.0rc2+gitr${SRCPV}"
 PR = "r15"
 DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_armv7a = "1"
 DEFAULT_PREFERENCE_om-gta02 = "1"
 
 PARALLEL_MAKE = ""