[Android] compile.sh: Bump tested hash to include the vout density patch

[Ludovic Fauvet]

vlc-ports/android | branch: master | Ludovic Fauvet <etix at videolan.org> | Fri Sep 21 15:44:44 2012 +0200| [0059fd5385b76316b34e99f0481624cd7b1ada7b] | committer: Ludovic Fauvet

compile.sh: Bump tested hash to include the vout density patch

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=0059fd5385b76316b34e99f0481624cd7b1ada7b
---

 compile.sh                                         |    2 +-
 ...ndroid-vout-expose-the-density-to-the-JNI.patch |   55 --------------------
 2 files changed, 1 insertion(+), 56 deletions(-)

diff --git a/compile.sh b/compile.sh
index 1c62733..e30e39f 100755
--- a/compile.sh
+++ b/compile.sh
@@ -88,7 +88,7 @@ export PLATFORM_SHORT_ARCH
 export PATH=${ANDROID_NDK}/toolchains/${PATH_HOST}-${GCCVER}/prebuilt/`uname|tr A-Z a-z`-x86/bin:${PATH}
 
 # 1/ libvlc, libvlccore and its plugins
-TESTED_HASH=eeaa3b9ef3
+TESTED_HASH=d7ad3f6
 if [ ! -d "vlc" ]; then
     echo "VLC source not found, cloning"
     git clone git://git.videolan.org/vlc.git vlc
diff --git a/patches/0006-android-vout-expose-the-density-to-the-JNI.patch b/patches/0006-android-vout-expose-the-density-to-the-JNI.patch
deleted file mode 100644
index 5e8b51b..0000000
--- a/patches/0006-android-vout-expose-the-density-to-the-JNI.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From b185385d73b661404ed99acebc9514ce95a5774b Mon Sep 17 00:00:00 2001
-From: Ludovic Fauvet <etix at videolan.org>
-Date: Thu, 20 Sep 2012 23:30:09 +0200
-Subject: [PATCH] android vout: expose the density to the JNI
-
----
- modules/video_output/androidsurface.c | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/modules/video_output/androidsurface.c b/modules/video_output/androidsurface.c
-index af2cdc1..952baba 100644
---- a/modules/video_output/androidsurface.c
-+++ b/modules/video_output/androidsurface.c
-@@ -66,7 +66,7 @@ vlc_module_end()
- 
- extern void *jni_LockAndGetAndroidSurface();
- extern void  jni_UnlockAndroidSurface();
--extern void  jni_SetAndroidSurfaceSize(int width, int height);
-+extern void  jni_SetAndroidSurfaceSize(int width, int height, int sar_num, int sar_den);
- 
- // _ZN7android7Surface4lockEPNS0_11SurfaceInfoEb
- typedef void (*Surface_lock)(void *, void *, int);
-@@ -92,6 +92,10 @@ struct vout_display_sys_t {
-     Surface_unlockAndPost s_unlockAndPost;
- 
-     picture_resource_t resource;
-+
-+    /* density */
-+    int i_sar_num;
-+    int i_sar_den;
- };
- 
- /* */
-@@ -218,6 +222,9 @@ static int Open(vlc_object_t *p_this) {
-     /* Fix initial state */
-     vout_display_SendEventFullscreen(vd, false);
- 
-+    sys->i_sar_num = vd->source.i_sar_num;
-+    sys->i_sar_den = vd->source.i_sar_den;
-+
-     return VLC_SUCCESS;
- 
- enomem:
-@@ -270,7 +277,7 @@ static int  AndroidLockSurface(picture_t *picture) {
-     // input size doesn't match the surface size,
-     // request a resize
-     if (info->w != sw || info->h != sh) {
--        jni_SetAndroidSurfaceSize(sw, sh);
-+        jni_SetAndroidSurfaceSize(sw, sh, sys->i_sar_num, sys->i_sar_den);
-         sys->s_unlockAndPost(surf);
-         jni_UnlockAndroidSurface();
-         return VLC_EGENERIC;
--- 
-1.7.12
-