vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Wed Jan 28 17:07:52 2015 +0100| [2204acd9cee5483eeaebcd3bb1c649055b7f1976] | committer: Jean-Baptiste Kempf
Contribs: update libdvdread to 5.0.2 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2204acd9cee5483eeaebcd3bb1c649055b7f1976 --- contrib/src/dvdread/SHA512SUMS | 2 +- contrib/src/dvdread/dvdread-win32.patch | 13 ------------- contrib/src/dvdread/rules.mak | 7 ++----- 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/contrib/src/dvdread/SHA512SUMS b/contrib/src/dvdread/SHA512SUMS index 4e0e837..d0d8463 100644 --- a/contrib/src/dvdread/SHA512SUMS +++ b/contrib/src/dvdread/SHA512SUMS @@ -1 +1 @@ -bc6d700001b6d71642ef92c4b9eec5732892f25ca53434edf0febf62797ebb85d2e5489109528c8e5b11cc71706b87c5ceedf458ed950b60efe6f2350ce4f09b libdvdread-5.0.0.tar.bz2 +2c963450d2870063f2f7cefbee3a574dcf570601bbb1834657fd8486715df80ad08da0d16a87e8081ec0baaab7b5509f02ab5aaa17a2ec95f7692819837b8f24 libdvdread-5.0.2.tar.bz2 diff --git a/contrib/src/dvdread/dvdread-win32.patch b/contrib/src/dvdread/dvdread-win32.patch deleted file mode 100644 index 6d258da..0000000 --- a/contrib/src/dvdread/dvdread-win32.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: dvdread/src/dvdread/ifo_types.h -=================================================================== ---- dvdread/src/dvdread/ifo_types.h (révision 1188) -+++ dvdread/src/dvdread/ifo_types.h (copie de travail) -@@ -32,7 +32,7 @@ - - #if defined(__GNUC__) - #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) --#define ATTRIBUTE_PACKED __attribute__ ((packed)) -+#define ATTRIBUTE_PACKED __attribute__ ((packed,gcc_struct)) - #define PRAGMA_PACK 0 - #endif - #endif diff --git a/contrib/src/dvdread/rules.mak b/contrib/src/dvdread/rules.mak index 66c1f66..09a086d 100644 --- a/contrib/src/dvdread/rules.mak +++ b/contrib/src/dvdread/rules.mak @@ -1,5 +1,5 @@ # DVDREAD -LIBDVDREAD_VERSION := 5.0.0 +LIBDVDREAD_VERSION := 5.0.2 LIBDVDREAD_URL := $(VIDEOLAN)/libdvdread/$(LIBDVDREAD_VERSION)/libdvdread-$(LIBDVDREAD_VERSION).tar.bz2 ifdef BUILD_DISCS @@ -7,7 +7,7 @@ ifdef GPL PKGS += dvdread endif endif -ifeq ($(call need_pkg,"dvdread > 4.9.0 "),) +ifeq ($(call need_pkg,"dvdread > 5.0.0 "),) PKGS_FOUND += dvdread endif @@ -18,9 +18,6 @@ $(TARBALLS)/libdvdread-$(LIBDVDREAD_VERSION).tar.bz2: dvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.bz2 .sum-dvdread $(UNPACK) -ifdef HAVE_WIN32 - $(APPLY) $(SRC)/dvdread/dvdread-win32.patch -endif cd $(UNPACK_DIR) && sed -i -e 's,Requires.private,Requires,g' misc/*.pc.in cd $(UNPACK_DIR) && autoreconf -ivf $(MOVE) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
