Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

tvheadend: drop support for PCRE

Browse source 
Drop support for PCRE as it's now EOL and won't receive any security
updates anymore.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Christian Marangi 2023-10-29 17:22:22 +01:00 committed by Rosen Penev
parent 13982c13d0
commit 9ea2ec7cd1
2 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
multimedia/tvheadend/Config.in
View file

@ -36,11 +36,6 @@ choice
help help
Use internal POSIX Regular Expressions. Use internal POSIX Regular Expressions.
Note that not all EPG parsers will work with POSIX RegEx. Note that not all EPG parsers will work with POSIX RegEx.
config TVHEADEND_REGEX_PCRE
bool "PCRE (libpcre)"
select PACKAGE_libpcre
help
Use more advanced Perl-Compatible Regular Expressions, provided by libpcre.
config TVHEADEND_REGEX_PCRE2 config TVHEADEND_REGEX_PCRE2
bool "PCRE2 (libpcre2)" bool "PCRE2 (libpcre2)"
select PACKAGE_libpcre2 select PACKAGE_libpcre2

12
multimedia/tvheadend/Makefile
View file

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=tvheadend PKG_NAME:=tvheadend
PKG_VERSION:=2023-06-05 PKG_VERSION:=2023-06-05
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/tvheadend/tvheadend.git PKG_SOURCE_URL:=https://github.com/tvheadend/tvheadend.git
@ -36,7 +36,6 @@ define Package/tvheadend
$(ICONV_DEPENDS) \ $(ICONV_DEPENDS) \
+zlib \ +zlib \
+TVHEADEND_AVAHI_SUPPORT:libavahi-client \ +TVHEADEND_AVAHI_SUPPORT:libavahi-client \
+TVHEADEND_REGEX_PCRE:libpcre \
+TVHEADEND_REGEX_PCRE2:libpcre2 \ +TVHEADEND_REGEX_PCRE2:libpcre2 \
+BUILD_PATENTED&&TVHEADEND_CSA:libdvbcsa +BUILD_PATENTED&&TVHEADEND_CSA:libdvbcsa
@ -77,15 +76,12 @@ ifeq ($(CONFIG_TVHEADEND_TRACE),)
CONFIGURE_ARGS += --disable-trace CONFIGURE_ARGS += --disable-trace
endif endif
CONFIGURE_ARGS += --disable-pcre
ifneq ($(CONFIG_TVHEADEND_REGEX_PCRE2),) ifneq ($(CONFIG_TVHEADEND_REGEX_PCRE2),)
CONFIGURE_ARGS += --disable-pcre --enable-pcre2 CONFIGURE_ARGS += --enable-pcre2
else
ifneq ($(CONFIG_TVHEADEND_REGEX_PCRE),)
CONFIGURE_ARGS += --enable-pcre --disable-pcre2
else else
ifneq ($(CONFIG_TVHEADEND_REGEX_POSIX),) ifneq ($(CONFIG_TVHEADEND_REGEX_POSIX),)
CONFIGURE_ARGS += --disable-pcre --disable-pcre2 CONFIGURE_ARGS += --disable-pcre2
endif
endif endif
endif endif