diff --git a/package/vlc/vlc-0001-fix-link-error.patch b/package/vlc/vlc-0001-fix-link-error.patch deleted file mode 100644 index 0acae8f038..0000000000 --- a/package/vlc/vlc-0001-fix-link-error.patch +++ /dev/null @@ -1,28 +0,0 @@ -Fix a link error. - -Signed-off-by: Simon Dawson - -diff -Nurp a/bin/Makefile.am b/bin/Makefile.am ---- a/bin/Makefile.am 2013-12-03 09:12:34.000000000 +0000 -+++ b/bin/Makefile.am 2014-01-06 22:03:34.888581851 +0000 -@@ -44,7 +44,7 @@ vlc_static_CFLAGS = $(AM_CFLAGS) \ - -DTOP_SRCDIR=\"$$(cd "$(top_srcdir)"; pwd)\" \ - $(NULL) - vlc_static_DEPENDENCIES = $(vlc_DEPENDENCIES) --vlc_static_LDADD = $(vlc_LDADD) -+vlc_static_LDADD = $(vlc_LDADD) ../compat/libcompat.la - vlc_static_LDFLAGS = $(vlc_LDFLAGS) - - if HAVE_WIN32 -diff -Nurp a/bin/Makefile.in b/bin/Makefile.in ---- a/bin/Makefile.in 2013-12-07 16:17:01.000000000 +0000 -+++ b/bin/Makefile.in 2014-01-06 22:04:10.888444978 +0000 -@@ -1049,7 +1049,7 @@ vlc_static_CFLAGS = $(AM_CFLAGS) \ - $(NULL) - - vlc_static_DEPENDENCIES = $(vlc_DEPENDENCIES) --vlc_static_LDADD = $(vlc_LDADD) -+vlc_static_LDADD = $(vlc_LDADD) ../compat/libcompat.la - vlc_static_LDFLAGS = $(vlc_LDFLAGS) $(am__append_7) - @HAVE_WIN32_TRUE@vlc_DEPENDENCIES = vlc_win32_rc.$(OBJEXT) - vlc_cache_gen_SOURCES = cachegen.c diff --git a/package/vlc/vlc-0001-vlc-static.patch b/package/vlc/vlc-0001-vlc-static.patch new file mode 100644 index 0000000000..faf7e80a1c --- /dev/null +++ b/package/vlc/vlc-0001-vlc-static.patch @@ -0,0 +1,24 @@ +diff -uNr vlc-2.1.5.org/bin/Makefile.am vlc-2.1.5/bin/Makefile.am +--- vlc-2.1.5.org/bin/Makefile.am 2013-12-03 10:12:34.000000000 +0100 ++++ vlc-2.1.5/bin/Makefile.am 2014-08-03 12:30:06.722154518 +0200 +@@ -1,7 +1,7 @@ + # Building vlc + # + bin_PROGRAMS = vlc +-noinst_PROGRAMS = vlc-static ++noinst_PROGRAMS = + noinst_DATA = + vlclib_PROGRAMS = vlc-cache-gen + EXTRA_PROGRAMS = vlc-wrapper +diff -uNr vlc-2.1.5.org/Makefile.am vlc-2.1.5/Makefile.am +--- vlc-2.1.5.org/Makefile.am 2014-02-14 18:40:50.000000000 +0100 ++++ vlc-2.1.5/Makefile.am 2014-08-03 12:29:52.059010766 +0200 +@@ -607,7 +607,7 @@ + cd lib && $(MAKE) $(AM_MAKEFLAGS) libvlc.la + + core: libvlc vlc$(EXEEXT) +- cd bin && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT) vlc-static$(EXEEXT) ++ cd bin && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT) + + doc: + cd doc && $(MAKE) $(AM_MAKEFLAGS) doc