diff options
| -rw-r--r-- | media-tv/tvheadend/files/4.0.6-use-glibc-version-iconv.patch | 40 | ||||
| -rw-r--r-- | media-tv/tvheadend/tvheadend-4.0.6.ebuild | 5 | ||||
| -rw-r--r-- | media-tv/tvheadend/tvheadend-9999.ebuild | 1 |
3 files changed, 3 insertions, 43 deletions
diff --git a/media-tv/tvheadend/files/4.0.6-use-glibc-version-iconv.patch b/media-tv/tvheadend/files/4.0.6-use-glibc-version-iconv.patch deleted file mode 100644 index 91187869a20..00000000000 --- a/media-tv/tvheadend/files/4.0.6-use-glibc-version-iconv.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 984bcbb1acadd2957d7fc79dc4ec72e2e07a3572 Mon Sep 17 00:00:00 2001 -From: Olliver Schinagl <oliver@schinagl.nl> -Date: Sat, 26 Sep 2015 22:36:08 +0200 -Subject: [PATCH] Use glibc version iconv - -Signed-off-by: Olliver Schinagl <oliver@schinagl.nl> ---- - Makefile | 2 +- - configure | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 07d6965..0ec0259 100644 ---- a/Makefile -+++ b/Makefile -@@ -39,7 +39,7 @@ else - LDFLAGS += -ldl -lpthread -lm - endif - ifeq ($(CONFIG_LIBICONV),yes) --LDFLAGS += -liconv -+LDFLAGS += - endif - ifeq ($(PLATFORM), darwin) - LDFLAGS += -framework CoreServices -diff --git a/configure b/configure -index 487456b..a6cce11 100755 ---- a/configure -+++ b/configure -@@ -214,7 +214,7 @@ int test(void) - iconv_t ic = iconv_open("ASCII", "ASCII"); - return 0; - } --' -liconv -+' - - if enabled_or_auto dvben50221; then - check_cc_snippet libdvben50221 ' --- -2.4.6 - diff --git a/media-tv/tvheadend/tvheadend-4.0.6.ebuild b/media-tv/tvheadend/tvheadend-4.0.6.ebuild index 596042b5f43..5512e71899b 100644 --- a/media-tv/tvheadend/tvheadend-4.0.6.ebuild +++ b/media-tv/tvheadend/tvheadend-4.0.6.ebuild @@ -17,9 +17,10 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="avahi ccache capmt constcw +cwc dbus +dvb +dvbscan epoll ffmpeg hdhomerun libav iconv imagecache inotify iptv satip +timeshift uriparser xmltv zlib" +IUSE="avahi ccache capmt constcw +cwc dbus +dvb +dvbscan epoll ffmpeg hdhomerun libav imagecache inotify iptv satip +timeshift uriparser xmltv zlib" RDEPEND="dev-libs/openssl:= + virtual/libiconv avahi? ( net-dns/avahi ) capmt? ( virtual/linuxtv-dvb-headers ) ccache? ( dev-util/ccache sys-libs/zlib ) @@ -30,7 +31,6 @@ RDEPEND="dev-libs/openssl:= libav? ( media-video/libav:= ) ) hdhomerun? ( media-libs/libhdhomerun ) - iconv? ( virtual/libiconv ) imagecache? ( net-misc/curl ) uriparser? ( dev-libs/uriparser ) zlib? ( sys-libs/zlib ) @@ -65,7 +65,6 @@ pkg_setup() { src_prepare() { # remove '-Werror' wrt bug #438424 sed -e 's:-Werror::' -i Makefile || die 'sed failed!' - epatch "${FILESDIR}/${PV}-use-glibc-version-iconv.patch" } src_configure() { diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild index 495a3d13973..184366eff32 100644 --- a/media-tv/tvheadend/tvheadend-9999.ebuild +++ b/media-tv/tvheadend/tvheadend-9999.ebuild @@ -17,6 +17,7 @@ KEYWORDS="" IUSE="avahi ccache +dvb +dvbscan ffmpeg imagecache inotify uriparser xmltv zlib" DEPEND="dev-libs/openssl:0= + virtual/libiconv avahi? ( net-dns/avahi ) ccache? ( dev-util/ccache ) dvb? ( virtual/linuxtv-dvb-headers ) |