diff options
| author |   Eric Hameleers <alien@slackware.com> | 2023-04-16 10:10:19 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2023-04-16 10:10:19 +0000 |
| commit | 2e27aa8bc5253929ebd93a1e70ab0f9c5fbe4ede (patch) | |
| tree | d13501834f7610379dec37a83eccf6095599fc92 /vlc | |
| parent | 229e6fa9069fb6cc6a0f19795d2f0a02fd76df7a (diff) | |
| download | asb-2e27aa8bc5253929ebd93a1e70ab0f9c5fbe4ede.tar.gz asb-2e27aa8bc5253929ebd93a1e70ab0f9c5fbe4ede.tar.xz | |
vlc: respin libupnp_pthread.patch for vlc-3.0.18
Diffstat (limited to 'vlc')
| -rw-r--r-- | vlc/build/patches/libupnp_pthread.patch | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/vlc/build/patches/libupnp_pthread.patch b/vlc/build/patches/libupnp_pthread.patch index ec858c73..645d6393 100644 --- a/vlc/build/patches/libupnp_pthread.patch +++ b/vlc/build/patches/libupnp_pthread.patch @@ -1,18 +1,11 @@ -Source: http://git.videolan.org/?p=vlc/vlc-3.0.git;a=blob_plain;f=contrib/src/upnp/libpthread.patch -libupnp: -lpthread must be checked first - -On GNU/Linux, -pthread does not work properly when linking a static -library that depends on POSIX threads. -lpthread must be checked first. - -diff -Nru upnp.orig/m4/acx_pthread.m4 upnp/m4/acx_pthread.m4 ---- upnp.orig/m4/acx_pthread.m4 2016-08-06 11:54:20.990800226 +0300 -+++ upnp/m4/acx_pthread.m4 2016-08-06 11:54:37.909800395 +0300 -@@ -123,7 +123,7 @@ - # which indicates that we try without any flags at all, and "pthread-config" - # which is a program returning the flags for the Pth emulation library. - --acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" -+acx_pthread_flags="pthreads none -Kthread -kthread lthread -lpthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" - - # The ordering *is* (sometimes) important. Some notes on the - # individual items follow: +Source: https://code.videolan.org/videolan/vlc/-/raw/3.0.18/contrib/src/upnp/libupnp-pthread-force.patch +--- upnp/configure.ac.pthread-w32 2018-05-17 11:51:47.115502500 +0200 ++++ upnp/configure.ac 2018-05-17 12:49:30.371786100 +0200 +@@ -667,6 +667,7 @@ ACX_PTHREAD( + # + # Update environment variables for pthreads + # ++PTHREAD_LIBS="-lpthread -pthread" + CC="$PTHREAD_CC" + CFLAGS="$PTHREAD_CFLAGS $CFLAGS" + LIBS="$PTHREAD_LIBS $LIBS" |