diff --git a/0001-Fix-build-with-unreleased-FLAC-1.3.x.patch b/0001-Fix-build-with-unreleased-FLAC-1.3.x.patch deleted file mode 100644 index c33baec..0000000 --- a/0001-Fix-build-with-unreleased-FLAC-1.3.x.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up vlc-2.0.5/modules/codec/flac.c.FLAC13 vlc-2.0.5/modules/codec/flac.c ---- vlc-2.0.5/modules/codec/flac.c.FLAC13 2011-12-08 19:00:26.000000000 +0100 -+++ vlc-2.0.5/modules/codec/flac.c 2013-01-02 20:48:33.569532663 +0100 -@@ -38,8 +38,8 @@ - #include - #include - --#include --#include -+#include -+#include - - #include - #include diff --git a/0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch b/0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch deleted file mode 100644 index fbd933a..0000000 --- a/0001-Switch-detection-of-smbclient-from-header-to-pkgconf.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 9cbe32f2d9542a4a8d17a0828c1a7c0046397f57 Mon Sep 17 00:00:00 2001 -From: Nicolas Chauvet -Date: Sat, 23 Feb 2013 16:39:23 +0100 -Subject: [PATCH] Switch detection of smbclient from header to pkgconfig - ---- - configure.ac | 5 +++-- - modules/access/Modules.am | 2 +- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 65377ac..6c634f2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1874,9 +1874,10 @@ dnl - AC_ARG_ENABLE(smb, - [AS_HELP_STRING([--disable-smb], [disable SMB/CIFS support (default auto)])]) - if test "${enable_smb}" != "no"; then -- AC_CHECK_HEADERS(libsmbclient.h, -+ PKG_CHECK_MODULES(SMBCLIENT, smbclient, - [ VLC_ADD_PLUGIN([access_smb]) -- VLC_ADD_LIBS([access_smb],[-lsmbclient]) ], -+ VLC_ADD_CFLAGS([access_smb],[$SMBCLIENT_CFLAGS]) -+ VLC_ADD_LIBS([access_smb],[$SMBCLIENT_LIBS])], - [ if test -n "${enable_smb}"; then - AC_MSG_ERROR([cannot find libsmbclient headers]) - fi ]) -diff --git a/modules/access/Modules.am b/modules/access/Modules.am -index ff6047e..c06c89b 100644 ---- a/modules/access/Modules.am -+++ b/modules/access/Modules.am -@@ -35,7 +35,7 @@ libsdp_plugin_la_LIBADD = $(AM_LIBADD) - libsdp_plugin_la_DEPENDENCIES = - - libaccess_smb_plugin_la_SOURCES = smb.c --libaccess_smb_plugin_la_CFLAGS = $(AM_CFLAGS) -+libaccess_smb_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_access_smb) - libaccess_smb_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_access_smb) - if HAVE_WIN32 - libaccess_smb_plugin_la_LIBADD += -lmpr --- -1.7.11.7 - diff --git a/vlc-2.0.2-xcb_discard.patch b/vlc-2.0.2-xcb_discard.patch deleted file mode 100644 index aca164f..0000000 --- a/vlc-2.0.2-xcb_discard.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up vlc-2.0.2/modules/access/screen/xcb.c.discard vlc-2.0.2/modules/access/screen/xcb.c ---- vlc-2.0.2/modules/access/screen/xcb.c.discard 2011-12-08 19:00:26.000000000 +0100 -+++ vlc-2.0.2/modules/access/screen/xcb.c 2012-07-11 15:07:43.092366202 +0200 -@@ -319,7 +319,11 @@ static void Demux (void *data) - msg_Err (demux, "bad X11 drawable 0x%08"PRIx32, sys->window); - discard: - if (sys->follow_mouse) -+#if 0 - xcb_discard_reply (conn, gc.sequence); -+#else -+ msg_Warn (demux, "xcb_discard_reply not available in libxcb < 1.6") ; -+#endif - return; - } - diff --git a/vlc-2.0.4-cache.patch b/vlc-2.0.4-cache.patch deleted file mode 100644 index 84e66e8..0000000 --- a/vlc-2.0.4-cache.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up vlc-2.0.4/bin/Makefile.am.cache vlc-2.0.4/bin/Makefile.am ---- vlc-2.0.4/bin/Makefile.am.cache 2011-12-08 19:00:25.000000000 +0100 -+++ vlc-2.0.4/bin/Makefile.am 2012-10-19 23:14:23.302736639 +0200 -@@ -80,7 +80,5 @@ MOSTLYCLEANFILES = $(noinst_DATA) - ../modules/plugins.dat: vlc-cache-gen$(EXEEXT) - $(AM_V_at)rm -f ../modules/plugins.dat - $(AM_V_GEN)if test "$(build)" = "$(host)"; then \ -- ./vlc-cache-gen$(EXEEXT) ../modules ; \ -- else \ -- echo "Cross-compilation: cache generation skipped!" ; \ -+ echo "Builder compilation: cache generation skipped!" ; \ - fi