[vlc-commits] contrib: dvdread: remove patch applied upstream

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Mon Mar 25 14:12:55 2013 +0100| [461a0548bd703e04106dbd948d54ceeaeff2aa9d] | committer: Rafaël Carré

contrib: dvdread: remove patch applied upstream

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=461a0548bd703e04106dbd948d54ceeaeff2aa9d
---

 contrib/src/dvdread/osx.patch |   25 -------------------------
 contrib/src/dvdread/rules.mak |    1 -
 2 files changed, 26 deletions(-)

diff --git a/contrib/src/dvdread/osx.patch b/contrib/src/dvdread/osx.patch
deleted file mode 100644
index de8745e..0000000
--- a/contrib/src/dvdread/osx.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7d9b5ac491659360cce4ba912f31b7fa2a020c20 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= <funman at videolan.org>
-Date: Tue, 19 Feb 2013 15:02:41 +0100
-Subject: [PATCH] Use the correct libraries for linker test
-
----
- configure.ac |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 30cab8d..7a2917b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -186,7 +186,7 @@ dnl link with libdvdcss
-     *darwin*) CSS_LIBS="${CSS_LIBS} -Wl,-framework,CoreFoundation -Wl,-framework,IOKit"
-     ;;
-   esac
--  AC_CHECK_LIB(dvdcss, dvdcss_interface_2,, AC_MSG_ERROR(You need libdvdcss.so.2 or later))
-+  AC_CHECK_LIB(dvdcss, dvdcss_interface_2,, AC_MSG_ERROR(You need libdvdcss.so.2 or later), ${CSS_LIBS})
-   AC_CHECK_HEADERS(dvdcss/dvdcss.h,, AC_MSG_ERROR(You need libdvdcss (dvdcss.h)))
- fi
- 
--- 
-1.7.10.4
-
diff --git a/contrib/src/dvdread/rules.mak b/contrib/src/dvdread/rules.mak
index 340dca1..a3b37a86 100644
--- a/contrib/src/dvdread/rules.mak
+++ b/contrib/src/dvdread/rules.mak
@@ -29,7 +29,6 @@ dvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.xz .sum-dvdread
 ifdef HAVE_WIN32
 	$(APPLY) $(SRC)/dvdread/dvdread-win32.patch
 endif
-	$(APPLY) $(SRC)/dvdread/osx.patch
 	cd $(UNPACK_DIR) && autoreconf -ivf
 	$(MOVE)