git » vlc.git » commit 310b468

diff --git a/PKGBUILD b/PKGBUILD
index 395eb03..c36a91f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=vlc
 pkgver=2.2.8
-pkgrel=2
+pkgrel=3
 pkgdesc='Multi-platform MPEG, VCD/DVD, and DivX player'
 url='https://www.videolan.org/vlc/'
 arch=('x86_64')
@@ -55,22 +55,25 @@ conflicts=('vlc-plugin')
 replaces=('vlc-plugin')
 options=('!emptydirs')
 source=(https://download.videolan.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz{,.asc}
-        vlc-2.2.6-fix-memleak.patch
         update-vlc-plugin-cache.hook
-        lua53_compat.patch)
+        vlc-2.2.6-fix-memleak.patch
+        lua53_compat.patch
+        vlc-2.2.8-libupnp-1.6.24.patch)
 sha512sums=('adde16f4b4bd2d94f104bb3b99995df6bf4603bc67333c7615cb8d1d31ca63440b6b0aa93de9ccf0dba717cf905577c7d0bca7baba63caf401790b82eac3e04a'
             'SKIP'
-            '0f16c0e1a21808a3e48a276ed41c3845650bb2d5df5386c8c50832aa769959a8d440086b0af3ae17add754b449a8501334b7f167c68210c255f55b53c40a799f'
             'd9e69a01eb8868647beac0f419328e6ca3fe14a2e2a9e6ce4b61ed590b41b0136fb3ac9e284b174a910c2fe8822d1b37445a48d0b7caea647060ebfabe899e7b'
-            '33cda373aa1fb3ee19a78748e2687f2b93c8662c9fda62ecd122a2e649df8edaceb54dda3991bc38c80737945a143a9e65baa2743a483bb737bb94cd590dc25f')
+            '0f16c0e1a21808a3e48a276ed41c3845650bb2d5df5386c8c50832aa769959a8d440086b0af3ae17add754b449a8501334b7f167c68210c255f55b53c40a799f'
+            '33cda373aa1fb3ee19a78748e2687f2b93c8662c9fda62ecd122a2e649df8edaceb54dda3991bc38c80737945a143a9e65baa2743a483bb737bb94cd590dc25f'
+            '28c7ec2cb6c84e7774daa281092d48b0a0719374ef196b03088ed66d20cb5eca52a42e7a141d9a71623aff24a17473dd8d32ba6779edb24af4788a765e3cef81')
 validpgpkeys=('65F7C6B4206BD057A7EB73787180713BE58D1ADC') # VideoLAN Release Signing Key
 
 prepare() {
   cd ${pkgname}-${pkgver}
   sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c
   sed -i -e 's:truetype/ttf-dejavu:TTF:g' modules/visualization/projectm.cpp
-  patch -p1 < "${srcdir}/lua53_compat.patch"
-  patch -p1 < "${srcdir}/vlc-2.2.6-fix-memleak.patch"
+  patch -Np1 < "${srcdir}/lua53_compat.patch"
+  patch -Np1 < "${srcdir}/vlc-2.2.6-fix-memleak.patch"
+  patch -Np1 < "${srcdir}/vlc-2.2.8-libupnp-1.6.24.patch"
 }
 
 build() {
@@ -79,7 +82,7 @@ build() {
   export PKG_CONFIG_PATH="/usr/lib/ffmpeg2.8/pkgconfig"
   export CFLAGS+=" -I/usr/include/samba-4.0"
   export CPPFLAGS+=" -I/usr/include/samba-4.0"
-  export CXXFLAGS+=" -std=gnu++98"
+  export CXXFLAGS+=" -std=c++11"
   export LUAC=/usr/bin/luac
   export LUA_LIBS="$(pkg-config --libs lua)"
   export RCC=/usr/bin/rcc-qt4
diff --git a/vlc-2.2.8-libupnp-1.6.24.patch b/vlc-2.2.8-libupnp-1.6.24.patch
new file mode 100644
index 0000000..4878550
--- /dev/null
+++ b/vlc-2.2.8-libupnp-1.6.24.patch
@@ -0,0 +1,32 @@
+From 9288c513fd7288ea85cd162aa610ca6d7e083992 Mon Sep 17 00:00:00 2001
+From: anthraxx <levente@leventepolyak.net>
+Date: Fri, 11 Jan 2018 23:57:53 +0100
+Subject: [PATCH] avoid defining getter functions present in libupnp 1.6.24
+
+---
+ modules/services_discovery/upnp.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/modules/services_discovery/upnp.cpp b/modules/services_discovery/upnp.cpp
+index b265113..f18afd6 100644
+--- a/modules/services_discovery/upnp.cpp
++++ b/modules/services_discovery/upnp.cpp
+@@ -50,6 +50,7 @@ typedef Upnp_Action_Complete UpnpActionComplete;
+ typedef Upnp_Event UpnpEvent;
+ typedef Upnp_Event_Subscribe UpnpEventSubscribe;
+ 
++#if UPNP_VERSION < 10624
+ static const char* UpnpDiscovery_get_Location_cstr( const UpnpDiscovery* p_discovery )
+ {
+   return p_discovery->Location;
+@@ -74,6 +75,7 @@ static const char* UpnpEventSubscribe_get_SID_cstr( const UpnpEventSubscribe* p_
+ {
+   return p_s->Sid;
+ }
++#endif
+ #else
+ typedef const void* UpnpEventPtr;
+ #endif
+-- 
+2.15.1
+