Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

vlc-git: a final working version (hopefully)

Browse Source
This commit is contained in:
martell
2014-10-18 22:34:36 +01:00
parent 250e9873e7
commit 9f7e1a2136
8 changed files with 11 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
mingw-w64-vlc-git/0004-disablefluidsynth.patch
View File

@@ -1,27 +0,0 @@
--- vlc/modules/codec/Makefile.am 2014-10-16 06:13:45.657952900 +0100
+++ vlc/modules/codec/Makefile.am 2014-10-16 06:40:02.767130700 +0100
@@ -40,15 +40,15 @@
libg711_plugin_la_SOURCES = codec/g711.c
codec_LTLIBRARIES += libg711_plugin.la
-libfluidsynth_plugin_la_SOURCES = codec/fluidsynth.c
-libfluidsynth_plugin_la_CFLAGS = $(AM_CFLAGS) $(FLUIDSYNTH_CFLAGS)
-libfluidsynth_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
-libfluidsynth_plugin_la_LIBADD = $(FLUIDSYNTH_LIBS)
-EXTRA_LTLIBRARIES += libfluidsynth_plugin.la
-codec_LTLIBRARIES += $(LTLIBfluidsynth)
-if HAVE_DARWIN
-libfluidsynth_plugin_la_LDFLAGS += -Wl,-framework,CoreFoundation,-framework,CoreServices
-endif
+#libfluidsynth_plugin_la_SOURCES = codec/fluidsynth.c
+#libfluidsynth_plugin_la_CFLAGS = $(AM_CFLAGS) $(FLUIDSYNTH_CFLAGS)
+#libfluidsynth_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
+#libfluidsynth_plugin_la_LIBADD = $(FLUIDSYNTH_LIBS)
+#EXTRA_LTLIBRARIES += libfluidsynth_plugin.la
+#codec_LTLIBRARIES += $(LTLIBfluidsynth)
+#if HAVE_DARWIN
+#libfluidsynth_plugin_la_LDFLAGS += -Wl,-framework,CoreFoundation,-framework,CoreServices
+#endif
liblpcm_plugin_la_SOURCES = codec/lpcm.c
codec_LTLIBRARIES += liblpcm_plugin.la

0
mingw-w64-vlc-git/0006-skip-pthread-time-declares.patch → mingw-w64-vlc-git/0004-skip-pthread-time-declares.patch
View File

0
mingw-w64-vlc-git/0008-disablestatic.patch → mingw-w64-vlc-git/0005-disablestatic.patch
View File

62
mingw-w64-vlc-git/0007-disablelibdvt.patch
View File

@@ -1,62 +0,0 @@
--- vlc/modules/access/Makefile.am 2014-10-16 20:07:02.239323300 +0100
+++ vlc/modules/access/Makefile.am 2014-10-16 20:24:11.055120600 +0100
@@ -292,34 +292,34 @@
### Digital TV ###
-libdtv_plugin_la_SOURCES = \
- access/dtv/dtv.h \
- access/dtv/access.c
-libdtv_plugin_la_CFLAGS = $(AM_CFLAGS)
-
-if HAVE_LINUX_DVB
-libdtv_plugin_la_SOURCES += access/dtv/linux.c
-libdtv_plugin_la_CFLAGS += -DHAVE_LINUX_DVB
-if HAVE_DVBPSI
-libdtv_plugin_la_SOURCES += access/dtv/en50221.c access/dtv/en50221.h mux/mpeg/dvbpsi_compat.h
-libdtv_plugin_la_CFLAGS += -DHAVE_DVBPSI $(DVBPSI_CFLAGS)
-libdtv_plugin_la_LIBADD = $(DVBPSI_LIBS)
-endif
-access_LTLIBRARIES += libdtv_plugin.la
-endif
+#libdtv_plugin_la_SOURCES = \
+# access/dtv/dtv.h \
+# access/dtv/access.c
+#libdtv_plugin_la_CFLAGS = $(AM_CFLAGS)
+
+#if HAVE_LINUX_DVB
+#libdtv_plugin_la_SOURCES += access/dtv/linux.c
+#libdtv_plugin_la_CFLAGS += -DHAVE_LINUX_DVB
+#if HAVE_DVBPSI
+#libdtv_plugin_la_SOURCES += access/dtv/en50221.c access/dtv/en50221.h mux/mpeg/dvbpsi_compat.h
+#libdtv_plugin_la_CFLAGS += -DHAVE_DVBPSI $(DVBPSI_CFLAGS)
+#libdtv_plugin_la_LIBADD = $(DVBPSI_LIBS)
+#endif
+#access_LTLIBRARIES += libdtv_plugin.la
+#endif
-if HAVE_WIN32
+#if HAVE_WIN32
# Work-around automake bug:
# Use an import library for C++ to retain C linker on other platforms.
-libbda_la_SOURCES = access/dtv/bdadefs.h access/dtv/bdagraph.cpp access/dtv/bdagraph.hpp
-libbda_la_LDFLAGS = -static
-libbda_la_LIBADD = -lstrmiids -lole32 -loleaut32 -luuid
-noinst_LTLIBRARIES += libbda.la
-
-libdtv_plugin_la_DEPENDENCIES = libbda.la
-libdtv_plugin_la_LIBADD = libbda.la -lstdc++
-access_LTLIBRARIES += libdtv_plugin.la
-endif
+#libbda_la_SOURCES = access/dtv/bdadefs.h access/dtv/bdagraph.cpp access/dtv/bdagraph.hpp
+#libbda_la_LDFLAGS = -static
+#libbda_la_LIBADD = -lstrmiids -lole32 -loleaut32 -luuid
+#noinst_LTLIBRARIES += libbda.la
+
+#libdtv_plugin_la_DEPENDENCIES = libbda.la
+#libdtv_plugin_la_LIBADD = libbda.la -lstdc++
+#access_LTLIBRARIES += libdtv_plugin.la
+#endif
# Old Linux DVB scanner
libdvb_plugin_la_SOURCES = \

21
mingw-w64-vlc-git/0009-disablesvgdecplugin.patch
View File

@@ -1,21 +0,0 @@
--- vlc/modules/codec/Makefile.am 2014-10-16 21:12:41.677077100 +0100
+++ vlc/modules/codec/Makefile.am 2014-10-17 00:33:52.392962300 +0100
@@ -110,12 +110,12 @@
EXTRA_LTLIBRARIES += libjpeg_plugin.la
codec_LTLIBRARIES += $(LTLIBjpeg)
-libsvgdec_plugin_la_SOURCES = codec/svg.c
-libsvgdec_plugin_la_CFLAGS = $(AM_CLAGS) $(CFLAGS_svgdec)
-libsvgdec_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' $(LDFLAGS_svg)
-libsvgdec_plugin_la_LIBADD = $(LIBS_svgdec)
-EXTRA_LTLIBRARIES += libsvgdec_plugin.la
-codec_LTLIBRARIES += $(LTLIBsvgdec)
+#libsvgdec_plugin_la_SOURCES = codec/svg.c
+#libsvgdec_plugin_la_CFLAGS = $(AM_CLAGS) $(CFLAGS_svgdec)
+#libsvgdec_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' $(LDFLAGS_svg)
+#libsvgdec_plugin_la_LIBADD = $(LIBS_svgdec)
+#EXTRA_LTLIBRARIES += libsvgdec_plugin.la
+#codec_LTLIBRARIES += $(LTLIBsvgdec)
libsdl_image_plugin_la_SOURCES = codec/sdl_image.c
libsdl_image_plugin_la_CFLAGS = $(AM_CFLAGS) $(SDL_IMAGE_CFLAGS)

27
mingw-w64-vlc-git/0010-disablelibsvgplugin.patch
View File

@@ -1,27 +0,0 @@
--- vlc/modules/text_renderer/Makefile.am 2014-10-17 05:02:41.033285100 +0100
+++ vlc/modules/text_renderer/Makefile.am 2014-10-17 05:03:47.089513900 +0100
@@ -35,15 +35,15 @@
EXTRA_LTLIBRARIES += libquartztext_plugin.la
text_renderer_LTLIBRARIES += $(LTLIBquartztext)
-libsvg_plugin_la_SOURCES = $(SOURCES_svg)
-libsvg_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_svg) -DMODULE_NAME_IS_svg
-libsvg_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_svg)
-libsvg_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(CXXFLAGS_svg)
-libsvg_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) $(OBJCFLAGS_svg)
-libsvg_plugin_la_LIBADD = $(LIBS_svg)
-libsvg_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(text_rendererdir)' $(LDFLAGS_svg)
-EXTRA_LTLIBRARIES += libsvg_plugin.la
-text_renderer_LTLIBRARIES += $(LTLIBsvg)
+#libsvg_plugin_la_SOURCES = $(SOURCES_svg)
+#libsvg_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_svg) -DMODULE_NAME_IS_svg
+#libsvg_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_svg)
+#libsvg_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(CXXFLAGS_svg)
+#libsvg_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) $(OBJCFLAGS_svg)
+#libsvg_plugin_la_LIBADD = $(LIBS_svg)
+#libsvg_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(text_rendererdir)' $(LDFLAGS_svg)
+#EXTRA_LTLIBRARIES += libsvg_plugin.la
+#text_renderer_LTLIBRARIES += $(LTLIBsvg)
libtdummy_plugin_la_SOURCES = $(SOURCES_tdummy)
libtdummy_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_tdummy) -DMODULE_NAME_IS_tdummy

0
mingw-w64-vlc-git/0005-fix_REENTRANT-2.2.patch → mingw-w64-vlc-git/0010-fix_REENTRANT-2.2.patch
View File

55
mingw-w64-vlc-git/PKGBUILD
View File

@@ -6,7 +6,7 @@ pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
_ver_base=2.2
pkgver=2.2.0.57990.b3f316e
pkgver=2.2.0.58010.e782ae3
pkgrel=1
pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
arch=('any')
@@ -108,25 +108,17 @@ source=("${_realname}-${_ver_base}"::"git://git.videolan.org/${_realname}/${_rea
0001-fix-redeclare.patch
0002-msvcrt-lfind.patch
0003-fix-prog-find-2.2.patch
0004-disablefluidsynth.patch
0005-fix_REENTRANT-2.2.patch
0006-skip-pthread-time-declares.patch
0007-disablelibdvt.patch
0008-disablestatic.patch
0009-disablesvgdecplugin.patch
0010-disablelibsvgplugin.patch
0004-skip-pthread-time-declares.patch
0005-disablestatic.patch
0010-fix_REENTRANT-2.2.patch
0011-prefer-static-libs.patch)
md5sums=('SKIP'
'a546326fd9beb9a04e066bad6c1945c9'
'e1d4601bec65f1287f87a66b13f98226'
'0ea45934d7819fe63384dd8ef95c9de2'
'573f704e5d474dc316fb4a0278c28ab4'
'd858696f47e0688b4706d598fd7e42ed'
'e17fb5732ceaa7897a5f5183764393ad'
'ccc31a8fbbead42dbc25ec3429c226b9'
'1e544f65bd17b5af5b862098412f99f7'
'9891738e7c1359b009a59eabde8126b6'
'49e7f1373d887f4c022451a2036c4186'
'd858696f47e0688b4706d598fd7e42ed'
'bc2038d61add89c423dc7145cdc6c843')
pkgver() {
@@ -143,15 +135,11 @@ prepare() {
cd "${srcdir}"/${_realname}-${_ver_base}
patch -Np1 -i "${srcdir}/0001-fix-redeclare.patch"
patch -p1 -i "${srcdir}/0002-msvcrt-lfind.patch"
patch -p1 -i "${srcdir}/0003-fix-prog-find-2.2.patch"
#patch -p1 -i "${srcdir}/0004-disablefluidsynth.patch"
#patch -p1 -i "${srcdir}/0005-fix_REENTRANT-2.2.patch"
patch -p1 -i "${srcdir}/0006-skip-pthread-time-declares.patch"
#patch -p1 -i "${srcdir}/0007-disablelibdvt.patch"
patch -p1 -i "${srcdir}/0008-disablestatic.patch"
#patch -p1 -i "${srcdir}/0009-disablesvgdecplugin.patch"
#patch -p1 -i "${srcdir}/0010-disablelibsvgplugin.patch"
patch -p1 -i "${srcdir}/0002-msvcrt-lfind.patch"
patch -p1 -i "${srcdir}/0003-fix-prog-find-2.2.patch"
patch -p1 -i "${srcdir}/0004-skip-pthread-time-declares.patch"
patch -p1 -i "${srcdir}/0005-disablestatic.patch"
patch -p1 -i "${srcdir}/0010-fix_REENTRANT-2.2.patch"
patch -Rp1 -i "${srcdir}/0011-prefer-static-libs.patch"
./bootstrap
@@ -171,7 +159,7 @@ build() {
local _privdir=${_qtguiinc}/QtGui/${_qtver}/QtGui
CPPFLAGS+=" -I${_privdir}"
# These are the minimal options I was able to build
# These are the current options I was able to build
${srcdir}/${_realname}-${_ver_base}/configure \
--prefix=${MINGW_PREFIX} \
--sysconfdir=${MINGW_PREFIX}/etc \
@@ -218,27 +206,6 @@ build() {
# --disable-telx \
# --enable-nls \
# These are the options alexey had
# --disable-rpath \
# --enable-faad \
# --enable-nls \
# --enable-realrtsp \
# --enable-aa \
# --enable-vcdx \
# --enable-opus \
# --enable-sftp \
# --disable-dbus \
# --disable-gnomevfs \
# --disable-gst-decode \
# --without-x \
# --disable-silent-rules \
# --disable-bluray \
# --disable-ncurses \
# --disable-fluidsynth \
# --disable-gnutls \
# LUAC==${MINGW_PREFIX}/bin/luac LUA_LIBS="`pkg-config --libs lua`" \
# RCC==${MINGW_PREFIX}/bin/rcc
make
}