From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Mon, 31 May 2010 23:32:42 +0000 (+0200)
Subject: Contribs: update libdvdnav patches
X-Git-Tag: 1.2.0-pre1~6374
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=9734b1ffdfe7b49b846d2dfc097d6614cfa77557;p=vlc

Contribs: update libdvdnav patches

Resolution and Win32 threads have been merged upstream
---

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 9936711d2a..5b2bd2ad85 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1206,7 +1206,6 @@ ifdef SVN
 libdvdnav:
 	$(SVN) co $(LIBDVDNAV_SVN)  libdvdnav
 	patch -d libdvdnav -p0 < Patches/libdvdnav.patch
-	patch -d libdvdnav -p0 < Patches/libdvdnav-resolution.patch
 	(cd $@; ./autogen.sh noconfig)
 else
 libdvdnav-$(LIBDVDNAV_VERSION).tar.gz:
diff --git a/extras/contrib/src/Patches/libdvdnav-resolution.patch b/extras/contrib/src/Patches/libdvdnav-resolution.patch
deleted file mode 100644
index bc4ee01d66..0000000000
--- a/extras/contrib/src/Patches/libdvdnav-resolution.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Index: src/dvdnav/dvdnav.h
-===================================================================
---- src/dvdnav/dvdnav.h	(revision 1191)
-+++ src/dvdnav/dvdnav.h	(working copy)
-@@ -553,6 +553,11 @@
- uint8_t dvdnav_get_video_aspect(dvdnav_t *self);
- 
- /*
-+ * Get video resolution.
-+ */
-+int dvdnav_get_video_resolution(dvdnav_t *self, uint32_t *width, uint32_t *height);
-+
-+/*
-  * Get video scaling permissions.
-  * The scaling permission does only change on VTS boundaries.
-  * See the DVDNAV_VTS_CHANGE event.
-Index: src/vm/vm.c
-===================================================================
---- src/vm/vm.c	(revision 1191)
-+++ src/vm/vm.c	(working copy)
-@@ -858,8 +858,8 @@
-     break;
-   }
- }
-+#endif
- 
--/* currently unused */
- void vm_get_video_res(vm_t *vm, int *width, int *height) {
-   video_attr_t attr = vm_get_video_attr(vm);
- 
-@@ -883,7 +883,6 @@
-     break;
-   }
- }
--#endif
- 
- int vm_get_video_aspect(vm_t *vm) {
-   int aspect = vm_get_video_attr(vm).display_aspect_ratio;
-Index: src/vm/vm.h
-===================================================================
---- src/vm/vm.h	(revision 1191)
-+++ src/vm/vm.h	(working copy)
-@@ -159,8 +159,8 @@
- /* currently unused */
- void vm_get_audio_info(vm_t *vm, int *current, int *num_avail);
- void vm_get_subp_info(vm_t *vm, int *current, int *num_avail);
-+#endif
- void vm_get_video_res(vm_t *vm, int *width, int *height);
--#endif
- int  vm_get_video_aspect(vm_t *vm);
- int  vm_get_video_scale_permission(vm_t *vm);
- video_attr_t vm_get_video_attr(vm_t *vm);
-Index: src/dvdnav.c
-===================================================================
---- src/dvdnav.c	(revision 1191)
-+++ src/dvdnav.c	(working copy)
-@@ -844,7 +844,23 @@
- 
-   return retval;
- }
-+int dvdnav_get_video_resolution(dvdnav_t *this, uint32_t *width, uint32_t *height) {
-+  int w, h;
- 
-+  if(!this->started) {
-+    printerr("Virtual DVD machine not started.");
-+    return -1;
-+  }
-+
-+  pthread_mutex_lock(&this->vm_lock);
-+  vm_get_video_res(this->vm, &w, &h);
-+  pthread_mutex_unlock(&this->vm_lock);
-+  
-+  *width  = w;
-+  *height = h;
-+  return 0;
-+}
-+
- uint8_t dvdnav_get_video_scale_permission(dvdnav_t *this) {
-   uint8_t         retval;
- 
diff --git a/extras/contrib/src/Patches/libdvdnav.patch b/extras/contrib/src/Patches/libdvdnav.patch
index 11a5beab13..621da1b590 100644
--- a/extras/contrib/src/Patches/libdvdnav.patch
+++ b/extras/contrib/src/Patches/libdvdnav.patch
@@ -46,16 +46,3 @@ Index: Makefile.am
  
  EXTRA_DIST = autogen.sh \
  	     AUTHORS \
-Index: src/dvdnav_internal.h
-===================================================================
---- src/dvdnav_internal.h	(revision 1136)
-+++ src/dvdnav_internal.h	working copy)
-@@ -37,7 +37,7 @@
- #define pthread_mutex_init(a, b) InitializeCriticalSection(a)
- #define pthread_mutex_lock(a)    EnterCriticalSection(a)
- #define pthread_mutex_unlock(a)  LeaveCriticalSection(a)
--#define pthread_mutex_destroy(a)
-+#define pthread_mutex_destroy(a) DeleteCriticalSection(a)
-
- /* replacement gettimeofday implementation */
- #include <sys/timeb.h>
\ No newline at end of file