diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2018-01-12 11:22:09 +0100 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2018-01-12 11:22:09 +0100 |
| commit | 163a4b79e6bd5e42ee23722641ef56b3dcda53ff (patch) | |
| tree | c66d6a78afeddd7a0341e809fc4643bbbd742e2d /extra/vlc | |
| parent | 534078fa033d0390d9129237f95be1c0930d2524 (diff) | |
| download | packages-163a4b79e6bd5e42ee23722641ef56b3dcda53ff.tar.xz | |
extra/vlc: patches for C++11 and libupnp accessers
Diffstat (limited to 'extra/vlc')
| -rw-r--r-- | extra/vlc/PKGBUILD | 18 | ||||
| -rw-r--r-- | extra/vlc/vlc-2.2.8-cpp11.patch | 11 | ||||
| -rw-r--r-- | extra/vlc/vlc-2.2.8-libupnp.patch | 16 |
3 files changed, 45 insertions, 0 deletions
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD new file mode 100644 index 00000000..77eb6d88 --- /dev/null +++ b/extra/vlc/PKGBUILD @@ -0,0 +1,18 @@ +# gcc 7.2.1 enforces that some header files are actually compiled with -std=c++11, +# the libupnp skim for older versions in vlc collides with the one supplied +# by the library + +source+=('vlc-2.2.8-cpp11.patch' + 'vlc-2.2.8-libupnp.patch') +sha512sums+=('0e186d64ffd0455e6ad1558ce509ce264eb03e2a0c7c2d7ef65e6aded4104a050d19c8f699c97cf31095198090f4e95bea4b4df1ae3a9075dc10e41e942c8993' + '5736e5fc5d33c7b6c5c5664d26efb3b65b2a14202fe7c3892711c0bad02fd823c92724cb42e6efecf38a0cc446280097b92d910fc84d45b49c2a87c183d64f5e') + +eval "$( + declare -f prepare | \ + sed ' + /^}$/ i \ + patch -Np1 < "${srcdir}/vlc-2.2.8-cpp11.patch" \ + ./bootstrap \ + patch -Np1 < "${srcdir}/vlc-2.2.8-libupnp.patch" + ' +)" diff --git a/extra/vlc/vlc-2.2.8-cpp11.patch b/extra/vlc/vlc-2.2.8-cpp11.patch new file mode 100644 index 00000000..67d04fba --- /dev/null +++ b/extra/vlc/vlc-2.2.8-cpp11.patch @@ -0,0 +1,11 @@ +diff -rauN vlc-2.2.8/configure.ac vlc-2.2.8-cpp11-patch/configure.ac +--- vlc-2.2.8/configure.ac 2017-11-21 19:35:05.000000000 +0100 ++++ vlc-2.2.8-cpp11-patch/configure.ac 2018-01-12 11:03:24.403333329 +0100 +@@ -66,6 +66,7 @@ + AC_DEFINE([WIN32_LEAN_AND_MEAN],, [Define to limit the scope of <windows.h>.]) + + AM_PROG_CC_C_O ++CXXFLAGS="$CXXFLAGS -std=c++11" + AC_PROG_CXX + AC_PROG_CPP + AC_PROG_OBJC diff --git a/extra/vlc/vlc-2.2.8-libupnp.patch b/extra/vlc/vlc-2.2.8-libupnp.patch new file mode 100644 index 00000000..34a59551 --- /dev/null +++ b/extra/vlc/vlc-2.2.8-libupnp.patch @@ -0,0 +1,16 @@ +diff -rauN vlc-2.2.8/modules/services_discovery/upnp.cpp vlc-2.2.8-libupnp-patch/modules/services_discovery/upnp.cpp +--- vlc-2.2.8/modules/services_discovery/upnp.cpp 2017-09-07 12:26:08.000000000 +0200 ++++ vlc-2.2.8-libupnp-patch/modules/services_discovery/upnp.cpp 2018-01-12 11:06:51.349999981 +0100 +@@ -50,6 +50,12 @@ + typedef Upnp_Event UpnpEvent; + typedef Upnp_Event_Subscribe UpnpEventSubscribe; + ++#undef UpnpDiscovery_get_Location_cstr ++#undef UpnpDiscovery_get_DeviceID_cstr ++#undef UpnpActionComplete_get_ActionResult ++#undef UpnpEvent_get_SID_cstr ++#undef UpnpEventSubscribe_get_SID_cstr ++ + static const char* UpnpDiscovery_get_Location_cstr( const UpnpDiscovery* p_discovery ) + { + return p_discovery->Location; |