mplayer: bump to version 1.2

index 644d292..1bd1dc0 100644
@@ -4,21 +4,20 @@ Using the -s option of install does not work, as it uses the host
 strip instead of the cross strip. So, get rid of it, and let Buildroot
 handle the stripping.
 
+[Vincent: tweak patch for version 1.2]
+
 Signed-off-by: Thomas Petazzoni <[email protected]>
----
- configure |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+Signed-off-by: Vicente Olivert Riera <[email protected]>
 
-Index: mplayer-32710/configure
-===================================================================
---- mplayer-32710.orig/configure
-+++ mplayer-32710/configure
-@@ -2519,7 +2519,7 @@
+diff -Nrua a/configure b/configure
+--- a/configure	2015-10-02 21:29:04.000000000 +0100
++++ b/configure	2015-10-06 13:28:37.245349592 +0100
+@@ -2780,7 +2780,7 @@
  
  
  # Checking for CFLAGS
 -_install_strip="-s"
 +_install_strip=
- if test "$_profile" != "" || test "$_debug" != "" ; then
-   CFLAGS="-O2 $_march $_mcpu $_pipe $_debug $_profile"
-   WARNFLAGS="-W -Wall"
+ if test -z "$CFLAGS" || test "$_profile" != "" || test "$_debug" != ""; then
+   if test "$cc_vendor" = "intel" ; then
+     CFLAGS="-O2 $_march $_mcpu $_pipe -fomit-frame-pointer"

deleted file mode 100644
index a3ba03f..0000000
@@ -1,22 +0,0 @@
-[PATCH] mplayer: fix --cc= parsing if the value contains equal signs (=)
-
-E.G. if -cc="$CROSS-gcc --sysroot=<SYSROOT>" is passed.
-
-Signed-off-by: Peter Korsgaard <[email protected]>
----
- configure |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: mplayer-32710/configure
-===================================================================
---- mplayer-32710.orig/configure
-+++ mplayer-32710/configure
-@@ -870,7 +870,7 @@
-     _target=$(echo $ac_option | cut -d '=' -f 2)
-     ;;
-   --cc=*)
--    _cc=$(echo $ac_option | cut -d '=' -f 2)
-+    _cc=$(echo $ac_option | cut -d '=' -f 2-)
-     ;;
-   --host-cc=*)
-     _host_cc=$(echo $ac_option | cut -d '=' -f 2)

similarity index 100%
rename from package/mplayer/0003-mpdemux-live555-async-interface.patch
rename to package/mplayer/0002-mpdemux-live555-async-interface.patch

deleted file mode 100644
index c14ef23..0000000
@@ -1,13 +0,0 @@
---- mplayer-1.1/configure	2013-12-03 00:32:10.815571460 -0800
-+++ mplayer-1.1-arc/configure	2013-11-29 00:34:29.238297709 -0800
-@@ -2492,6 +2492,10 @@
-   generic)
-     arch='generic'
-     ;;
-+  arc)
-+    arch='arc'
-+    iproc='arc'
-+    ;;
- 
-   *)
-     echo "The architecture of your CPU ($host_arch) is not supported by this configure script"

268 lines not on this page · raw message

44 lines not on this page · raw message

deleted file mode 100644
index dc59f5f..0000000
@@ -1,22 +0,0 @@
-Add support for ARM64 architecture
-
-This patch adds aarch64 as a supported architecture to the configure script.
-
-Signed-off-by: Joao Pinto <[email protected]>
----
-
---- b/configure	2015-09-15 17:30:46.187307557 +0100
-+++ a/configure	2015-09-15 17:31:11.729307537 +0100
-@@ -2496,6 +2496,10 @@
-     arch='arc'
-     iproc='arc'
-     ;;
-+  aarch64)
-+    arch='arm64'
-+    iproc='arm64'
-+    ;;
- 
-   *)
-     echo "The architecture of your CPU ($host_arch) is not supported by this configure script"
-
-

index f1f9aca..49c5631 100644
@@ -1,4 +1,4 @@
-# From http://www.mplayerhq.hu/MPlayer/releases/MPlayer-1.1.1.tar.xz.md5
-md5	39dd55f30eb5403f219a606e79a6648a	MPlayer-1.1.1.tar.xz
-# From http://www.mplayerhq.hu/MPlayer/releases/MPlayer-1.1.1.tar.xz.sha1
-sha1	ba2f3bd1442d04b17b0143680850273d928689c1	MPlayer-1.1.1.tar.xz
+# From http://www.mplayerhq.hu/MPlayer/releases/MPlayer-1.2.tar.xz.md5
+md5 58409fccb8ef33013fb780405405491f  MPlayer-1.2.tar.xz
+# From http://www.mplayerhq.hu/MPlayer/releases/MPlayer-1.2.tar.xz.sha1
+sha1 64fad840dfae466ab5ef3be2b6c74058892cd981  MPlayer-1.2.tar.xz

index 5a46aa3..bab7ed7 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MPLAYER_VERSION = 1.1.1
+MPLAYER_VERSION = 1.2
 MPLAYER_SOURCE = MPlayer-$(MPLAYER_VERSION).tar.xz
 MPLAYER_SITE = http://www.mplayerhq.hu/MPlayer/releases
 

@@ -107,7 +107,6 @@ MPLAYER_CONF_OPTS += --disable-libcdio
 ifeq ($(BR2_PACKAGE_LIBDVDREAD),y)
 MPLAYER_CONF_OPTS +=  \
 	--enable-dvdread \
-	--disable-dvdread-internal \
 	--with-dvdread-config=$(STAGING_DIR)/usr/bin/dvdread-config
 MPLAYER_DEPENDENCIES += libdvdread
 endif

@@ -160,7 +159,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_TREMOR),y)
 MPLAYER_DEPENDENCIES += tremor
-MPLAYER_CONF_OPTS += --disable-tremor-internal --enable-tremor
+MPLAYER_CONF_OPTS += --enable-tremor
 endif
 
 ifeq ($(BR2_PACKAGE_LIBVORBIS),y)