Main mplayer2 repo is extinted, change to repo.or.cz backup. add some patches

4 files changed, 62 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ecf6d49cf9e4..d134105d9d44 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -60,18 +60,21 @@ pkgbase = mplayer2-build-git
 	options = !emptydirs
 	backup = etc/mplayer/codecs.conf
 	backup = etc/mplayer/input.conf
-	source = http://ftp.mplayer2.org/pub/release/mplayer2-2.0.tar.xz
-	source = git://git.mplayer2.org/mplayer2-build.git
-	source = git://git.mplayer2.org/mplayer2.git
+	source = https://dl.dropboxusercontent.com/u/6596386/mplayer2/mplayer2-2.0.tar.xz
+	source = git+http://repo.or.cz/mplayer2-build.git
+	source = git+http://repo.or.cz/mplayer2.git
 	source = libav::git://repo.or.cz/FFMpeg-mirror/mplayer-patches.git
 	source = git+https://github.com/libass/libass.git
-	source = http://devel.mplayer2.org/raw-attachment/ticket/265/0004-use-pkg-config-for-dvdnav.patch
-	source = http://devel.mplayer2.org/raw-attachment/ticket/265/0005-switch_title-switch-to-next-title-if-no-parameter-pa.patch
+	source = 0004-use-pkg-config-for-dvdnav.patch
+	source = 0005-switch_title-switch-to-next-title-if-no-parameter-pa.patch
 	source = stream_dvdnav.diff
 	source = giflib-5.0.patch
 	source = giflib-5.1.patch
 	source = libquvi-0.9.patch
 	source = include-samba-4.0.patch
+	source = vo_gl_locale_fix.patch
+	source = patch-libmpcodecs-vd_theora.patch::https://svnweb.freebsd.org/ports/head/multimedia/mplayer2/files/patch-libmpcodecs-vd_theora.c?view=co
+	source = patch-libmpdemux-demux_ogg.patch::https://svnweb.freebsd.org/ports/head/multimedia/mplayer2/files/patch-libmpdemux-demux_ogg.c?view=co
 	sha1sums = 0df8d4e5484128b7b28029273b7704ab5d5419bc
 	sha1sums = SKIP
 	sha1sums = SKIP
@@ -84,6 +87,9 @@ pkgbase = mplayer2-build-git
 	sha1sums = 85d54b02f6f59fa9bd785d403c852031dcb517af
 	sha1sums = 06919a6dc0ae8db9e8ab50b55bb83a26445de51d
 	sha1sums = 8c2fc1526a413cd821b46fd48ea08364abbf5c4c
+	sha1sums = 703825cd187fe90c449a299ced54710ced494ed7
+	sha1sums = e06f326f1e44c79fb2825c6d486f6be9b66de32a
+	sha1sums = cf498ba02cfdfd6e005808a2418adaf8adae0e28
 
 pkgname = mplayer2-build-git
 
diff --git a/.gitignore b/.gitignore
index b4279ab87992..1f739865bdcd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 !include-samba-4.0.patch
 !libquvi-0.9.patch
 !stream_dvdnav.diff
+!vo_gl_locale_fix.patch
diff --git a/PKGBUILD b/PKGBUILD
index ee6d35753772..c5c6c3a64c11 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,18 +17,21 @@ provides=('mplayer' 'mplayer2')
 conflicts=('mplayer' 'mplayer2')
 replaces=('mplayer' 'mplayer2')
 options=('!emptydirs')
-source=('http://ftp.mplayer2.org/pub/release/mplayer2-2.0.tar.xz'
-        'git://git.mplayer2.org/mplayer2-build.git'
-        'git://git.mplayer2.org/mplayer2.git'
+source=('https://dl.dropboxusercontent.com/u/6596386/mplayer2/mplayer2-2.0.tar.xz'
+        'git+http://repo.or.cz/mplayer2-build.git'
+        'git+http://repo.or.cz/mplayer2.git'
         'libav::git://repo.or.cz/FFMpeg-mirror/mplayer-patches.git'
         'git+https://github.com/libass/libass.git'
-        'http://devel.mplayer2.org/raw-attachment/ticket/265/0004-use-pkg-config-for-dvdnav.patch'
-        'http://devel.mplayer2.org/raw-attachment/ticket/265/0005-switch_title-switch-to-next-title-if-no-parameter-pa.patch'
+        '0004-use-pkg-config-for-dvdnav.patch'
+        '0005-switch_title-switch-to-next-title-if-no-parameter-pa.patch'
         'stream_dvdnav.diff'
         'giflib-5.0.patch'
         'giflib-5.1.patch'
         'libquvi-0.9.patch'
-        'include-samba-4.0.patch')
+        'include-samba-4.0.patch'
+        'vo_gl_locale_fix.patch'
+        'patch-libmpcodecs-vd_theora.patch::https://svnweb.freebsd.org/ports/head/multimedia/mplayer2/files/patch-libmpcodecs-vd_theora.c?view=co'
+        'patch-libmpdemux-demux_ogg.patch::https://svnweb.freebsd.org/ports/head/multimedia/mplayer2/files/patch-libmpdemux-demux_ogg.c?view=co')
 sha1sums=('0df8d4e5484128b7b28029273b7704ab5d5419bc'
           'SKIP'
           'SKIP'
@@ -40,17 +43,20 @@ sha1sums=('0df8d4e5484128b7b28029273b7704ab5d5419bc'
           'f8b33a47c4aae10fdd6de246667dd0f7900a3142'
           '85d54b02f6f59fa9bd785d403c852031dcb517af'
           '06919a6dc0ae8db9e8ab50b55bb83a26445de51d'
-          '8c2fc1526a413cd821b46fd48ea08364abbf5c4c')
+          '8c2fc1526a413cd821b46fd48ea08364abbf5c4c'
+          '703825cd187fe90c449a299ced54710ced494ed7'
+          'e06f326f1e44c79fb2825c6d486f6be9b66de32a'
+          'cf498ba02cfdfd6e005808a2418adaf8adae0e28')
 install=mplayer2-build-git.install
 noextract=('mplayer2-2.0.tar.xz')
 
 pkgver() {
-  cd "${srcdir}/mplayer2"
+  cd mplayer2
   echo "$(git describe --always | tr - . | tr -d v)"
 }
 
 prepare() {
-  cd "${_gitname}"
+  cd mplayer2-build
   git submodule init
   git config submodule.mplayer.url "${srcdir}/mplayer2"
   git config submodule.libass.url "${srcdir}/libass"
@@ -59,7 +65,7 @@ prepare() {
 
 
   # Install language sources to "i18n"
-  bsdtar -xf "${srcdir}/mplayer2-2.0.tar.xz" mplayer2-2.0/po
+  bsdtar -xf ../mplayer2-2.0.tar.xz mplayer2-2.0/po
   rm -fr mplayer/po
   mv mplayer2-2.0/po mplayer/po
   rm -fr mplayer2-2.0
@@ -71,10 +77,7 @@ prepare() {
   patch -p1 -i ../../0005-switch_title-switch-to-next-title-if-no-parameter-pa.patch
 
   # Fix build with libdvdnav-git
-  if [ "$(pkg-config --modversion dvdnav)" != "4.2.1" ]; then
-    msg2 "libdvdnav-git is installed: patching sources"
-    patch -p1 -i ../../stream_dvdnav.diff
-  fi
+  patch -p1 -i ../../stream_dvdnav.diff
 
   # Fix build with giflib 5.1.x
   patch -p1 -i ../../giflib-5.0.patch
@@ -86,6 +89,12 @@ prepare() {
   # Fix samba includes
   patch -p1 -i ../../include-samba-4.0.patch
 
+  # Fix brawbraw (?)
+  patch -p1 -i ../../vo_gl_locale_fix.patch
+
+  # Fix vd_theora
+  patch -p0 -i ../../patch-libmpcodecs-vd_theora.patch
+  patch -p0 -i ../../patch-libmpdemux-demux_ogg.patch
 
   # Make Mplayer2 build flags
   echo '--confdir=/etc/mplayer
@@ -97,7 +106,7 @@ prepare() {
 }
 
 build() {
-  make -C mplayer2-build
+  LDFLAGS+=" -ltheoradec" make -C mplayer2-build
 }
 
 package() {
diff --git a/vo_gl_locale_fix.patch b/vo_gl_locale_fix.patch
new file mode 100644
index 000000000000..9489b4ea7633
--- /dev/null
+++ b/vo_gl_locale_fix.patch
@@ -0,0 +1,26 @@
+The generated output may use something other than "." for decimal
+point, which GLSL requires. This is caused by locale. C uses ".", 
+so locale is temporaily set to "C" when sprinting floats. 
+diff -Naur mplayer2.old/libvo/gl_common.c mplayer2/libvo/gl_common.c
+--- mplayer2.old/libvo/gl_common.c	2014-02-24 21:57:13.493418840 +0100
++++ mplayer2/libvo/gl_common.c	2014-02-24 22:00:25.136048921 +0100
+@@ -39,6 +39,7 @@
+ #include <ctype.h>
+ #include <stdbool.h>
+ #include <math.h>
++#include <locale.h>
+ #include "talloc.h"
+ #include "gl_common.h"
+ #include "old_vo_wrapper.h"
+@@ -823,7 +824,10 @@
+ 
+ static void replace_var_float(char **text, const char *name, float replace)
+ {
++    char *tmp = setlocale(LC_NUMERIC, NULL);
++    setlocale(LC_NUMERIC, "C");
+     char *s = talloc_asprintf(NULL, "%e", replace);
++    setlocale(LC_NUMERIC, tmp);
+     replace_var_str(text, name, s);
+     talloc_free(s);
+ }
+