tvheadend: drop support for PCRE

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>
(cherry picked from commit 9ea2ec7cd1d9902352a67d6152107e9c452d6dbb)

diff --git a/multimedia/tvheadend/Config.in b/multimedia/tvheadend/Config.in
index de689fd330e45a966d698f22ddb1cb7b16598de8..b750bd9eb4f5a3473d78c6cc5108bde3fef1a601 100644 (file)
--- a/multimedia/tvheadend/Config.in
+++ b/multimedia/tvheadend/Config.in
@@ -36,11 +36,6 @@ choice
     help
       Use internal POSIX Regular Expressions.
       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
     bool "PCRE2 (libpcre2)"
     select PACKAGE_libpcre2

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