Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC
Commits:
3837f53f by Steve Lhomme at 2022-02-10T15:30:42+00:00
contrib: zvbi: remove deprecated patch
We no longer build with pthreadGC2 since
f1bf4b45ce547578db7048331e368188a7f6b8ec
- - - - -
1ae503e4 by Steve Lhomme at 2022-02-10T15:30:42+00:00
contrib: zvbi: fix pthread dependency
- - - - -
e1ebf07d by Steve Lhomme at 2022-02-10T15:30:42+00:00
contrib: zvbi: remove unused extra compilation flags
- - - - -
2 changed files:
- contrib/src/zvbi/rules.mak
- − contrib/src/zvbi/zvbi-pthread-w32.patch
Changes:
=====================================
contrib/src/zvbi/rules.mak
=====================================
@@ -20,9 +20,6 @@ zvbi: zvbi-$(ZVBI_VERSION).tar.bz2 .sum-zvbi
$(APPLY) $(SRC)/zvbi/zvbi-fix-static-linking.patch
ifdef HAVE_WIN32
$(APPLY) $(SRC)/zvbi/zvbi-win32.patch
-ifdef HAVE_WINSTORE
- $(APPLY) $(SRC)/zvbi/zvbi-pthread-w32.patch
-endif
endif
$(APPLY) $(SRC)/zvbi/zvbi-fix-clang-support.patch
ifdef HAVE_ANDROID
@@ -32,8 +29,6 @@ endif
DEPS_zvbi = png $(DEPS_png) iconv $(DEPS_iconv)
-ZVBI_CFLAGS := $(CFLAGS)
-ZVBI_CXXFLAGS := $(CXXFLAGS)
ZVBICONF := \
--disable-dvb --disable-bktr \
--disable-nls --disable-proxy \
@@ -41,13 +36,13 @@ ZVBICONF := \
$(HOSTCONF)
ifdef HAVE_WIN32
-DEPS_upnp += pthreads $(DEPS_pthreads)
+DEPS_zvbi += pthreads $(DEPS_pthreads)
endif
.zvbi: zvbi
$(UPDATE_AUTOCONFIG)
$(RECONF)
- cd $< && $(HOSTVARS) CFLAGS="$(ZVBI_CFLAGS)"
CXXFLAGS="$(ZVBI_CXXFLAGS)" ./configure $(ZVBICONF)
+ cd $< && $(HOSTVARS) ./configure $(ZVBICONF)
cd $< && $(MAKE) -C src install
cd $< && $(MAKE) SUBDIRS=. install
sed -i.orig -e "s/\/[^ ]*libiconv.a/-liconv/"
$(PREFIX)/lib/pkgconfig/zvbi-0.2.pc
=====================================
contrib/src/zvbi/zvbi-pthread-w32.patch deleted
=====================================
@@ -1,11 +0,0 @@
---- zvbi/configure.in 2018-05-16 14:04:41.881375400 +0200
-+++ zvbi/configure.in.pthread-w32 2018-05-16 14:03:52.661096100 +0200
-@@ -167,7 +167,7 @@ dnl
- dnl Check how to link pthreads functions.
- dnl (-lpthread on Linux, -pthread on FreeBSD).
- dnl
--AC_CHECK_LIB(pthread, pthread_create,,[
-+AC_SEARCH_LIBS(pthread_create,[pthreadGC2 pthread],,[
- AC_TRY_LINK(, pthread_create();,,[
- LDFLAGS="$LDFLAGS -pthread"
- AC_TRY_LINK(, pthread_create();,,[
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/e890cc923355b87d4c40d035dbf16a4924fe95b2...e1ebf07d6e2a9c95db006950dfe0782e1cb9e775
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/e890cc923355b87d4c40d035dbf16a4924fe95b2...e1ebf07d6e2a9c95db006950dfe0782e1cb9e775
You're receiving this email because of your account on code.videolan.org.
_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits
