diff --git a/Dockerfile b/Dockerfile index 4b91dc2..81eb115 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,6 @@ FROM ghcr.io/linuxserver/baseimage-alpine:3.18 as buildstage # package versions ARG ARGTABLE_VER="2.13" -ARG XMLTV_VER="v1.0.0" # environment settings ARG TZ="Etc/UTC" @@ -48,58 +47,6 @@ RUN \ opus-dev \ patch \ pcre2-dev \ - perl-archive-zip \ - perl-boolean \ - perl-capture-tiny \ - perl-cgi \ - perl-compress-raw-zlib \ - perl-date-manip \ - perl-datetime \ - perl-datetime-format-strptime \ - perl-datetime-timezone \ - perl-dbd-sqlite \ - perl-dbi \ - perl-dev \ - perl-digest-sha1 \ - perl-doc \ - perl-file-slurp \ - perl-file-temp \ - perl-file-which \ - perl-getopt-long \ - perl-html-parser \ - perl-html-tree \ - perl-http-cookies \ - perl-io \ - perl-io-html \ - perl-io-socket-ssl \ - perl-io-stringy \ - perl-json \ - perl-json-xs \ - perl-libwww \ - perl-lingua-en-numbers-ordinate \ - perl-lingua-preferred \ - perl-list-moreutils \ - perl-lwp-useragent-determined \ - perl-module-build \ - perl-module-pluggable \ - perl-net-ssleay \ - perl-parse-recdescent \ - perl-path-class \ - perl-scalar-list-utils \ - perl-term-progressbar \ - perl-term-readkey \ - perl-test-exception \ - perl-test-requires \ - perl-timedate \ - perl-try-tiny \ - perl-unicode-string \ - perl-xml-libxml \ - perl-xml-libxslt \ - perl-xml-parser \ - perl-xml-sax \ - perl-xml-treepp \ - perl-xml-twig \ - perl-xml-writer \ pkgconf \ pngquant \ python3 \ @@ -114,29 +61,6 @@ RUN \ rm -rf /usr/include/iconv.h && \ cp /usr/include/gnu-libiconv/iconv.h /usr/include/iconv.h -RUN \ - echo "**** install perl modules for xmltv ****" && \ - curl -s -L https://cpanmin.us | perl - App::cpanminus && \ - cpanm --no-interactive --installdeps /tmp/patches - -RUN \ - echo "**** compile XMLTV ****" && \ - git clone https://github.com/XMLTV/xmltv.git /tmp/xmltv && \ - cd /tmp/xmltv && \ - git checkout ${XMLTV_VER} && \ - echo "**** Perl 5.26 fixes for XMTLV ****" && \ - sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_latex && \ - sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_text && \ - sed "s/\(lib\/set_share_dir.pl';\)/.\/\1/" -i grab/it/tv_grab_it.PL && \ - sed "s/\(filter\/Grep.pm';\)/.\/\1/" -i filter/tv_grep.PL && \ - sed "s/\(lib\/XMLTV.pm.in';\)/.\/\1/" -i lib/XMLTV.pm.PL && \ - sed "s/\(lib\/Ask\/Term.pm';\)/.\/\1/" -i Makefile.PL && \ - PERL5LIB=`pwd` && \ - echo -e "yes" | perl Makefile.PL PREFIX=/usr/ INSTALLDIRS=vendor && \ - make -j 2 && \ - make test && \ - make DESTDIR=/tmp/xmltv-build install - RUN \ echo "**** compile tvheadend ****" && \ if [ -z ${TVHEADEND_COMMIT+x} ]; then \ @@ -263,71 +187,18 @@ RUN \ opus \ pcre2 \ perl \ - perl-archive-zip \ - perl-boolean \ - perl-capture-tiny \ - perl-cgi \ - perl-compress-raw-zlib \ - perl-date-manip \ - perl-datetime \ - perl-datetime-format-strptime \ - perl-datetime-timezone \ - perl-dbd-sqlite \ - perl-dbi \ - perl-digest-sha1 \ - perl-doc \ - perl-file-slurp \ - perl-file-temp \ - perl-file-which \ - perl-getopt-long \ - perl-html-parser \ - perl-html-tree \ - perl-http-cookies \ - perl-io \ - perl-io-html \ - perl-io-socket-ssl \ - perl-io-stringy \ - perl-json \ - perl-json-xs \ - perl-libwww \ - perl-lingua-en-numbers-ordinate \ - perl-lingua-preferred \ - perl-list-moreutils \ - perl-lwp-useragent-determined \ - perl-module-build \ - perl-module-pluggable \ - perl-net-ssleay \ - perl-parse-recdescent \ - perl-path-class \ - perl-scalar-list-utils \ - perl-term-progressbar \ - perl-term-readkey \ - perl-test-exception \ - perl-test-requires \ - perl-timedate \ - perl-try-tiny \ - perl-unicode-string \ - perl-xml-libxml \ - perl-xml-libxslt \ - perl-xml-parser \ - perl-xml-sax \ - perl-xml-treepp \ - perl-xml-twig \ - perl-xml-writer \ py3-requests \ python3 \ uriparser \ x264 \ x265 \ + xmltv \ zlib # copy local files and buildstage artifacts COPY --from=buildstage /tmp/argtable-build/usr/ /usr/ COPY --from=buildstage /tmp/comskip-build/usr/ /usr/ COPY --from=buildstage /tmp/tvheadend-build/usr/ /usr/ -COPY --from=buildstage /tmp/xmltv-build/usr/ /usr/ -COPY --from=buildstage /usr/local/share/man/ /usr/local/share/man/ -COPY --from=buildstage /usr/local/share/perl5/ /usr/local/share/perl5/ COPY --from=buildstage /picons /picons COPY root/ / diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 3481301..accf1f1 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -10,7 +10,6 @@ FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18 as buildstage # package versions ARG ARGTABLE_VER="2.13" -ARG XMLTV_VER="v1.0.0" # environment settings ARG TZ="Etc/UTC" @@ -48,58 +47,6 @@ RUN \ opus-dev \ patch \ pcre2-dev \ - perl-archive-zip \ - perl-boolean \ - perl-capture-tiny \ - perl-cgi \ - perl-compress-raw-zlib \ - perl-date-manip \ - perl-datetime \ - perl-datetime-format-strptime \ - perl-datetime-timezone \ - perl-dbd-sqlite \ - perl-dbi \ - perl-dev \ - perl-digest-sha1 \ - perl-doc \ - perl-file-slurp \ - perl-file-temp \ - perl-file-which \ - perl-getopt-long \ - perl-html-parser \ - perl-html-tree \ - perl-http-cookies \ - perl-io \ - perl-io-html \ - perl-io-socket-ssl \ - perl-io-stringy \ - perl-json \ - perl-json-xs \ - perl-libwww \ - perl-lingua-en-numbers-ordinate \ - perl-lingua-preferred \ - perl-list-moreutils \ - perl-lwp-useragent-determined \ - perl-module-build \ - perl-module-pluggable \ - perl-net-ssleay \ - perl-parse-recdescent \ - perl-path-class \ - perl-scalar-list-utils \ - perl-term-progressbar \ - perl-term-readkey \ - perl-test-exception \ - perl-test-requires \ - perl-timedate \ - perl-try-tiny \ - perl-unicode-string \ - perl-xml-libxml \ - perl-xml-libxslt \ - perl-xml-parser \ - perl-xml-sax \ - perl-xml-treepp \ - perl-xml-twig \ - perl-xml-writer \ pkgconf \ pngquant \ python3 \ @@ -114,29 +61,6 @@ RUN \ rm -rf /usr/include/iconv.h && \ cp /usr/include/gnu-libiconv/iconv.h /usr/include/iconv.h -RUN \ - echo "**** install perl modules for xmltv ****" && \ - curl -s -L https://cpanmin.us | perl - App::cpanminus && \ - cpanm --no-interactive --installdeps /tmp/patches - -RUN \ - echo "**** compile XMLTV ****" && \ - git clone https://github.com/XMLTV/xmltv.git /tmp/xmltv && \ - cd /tmp/xmltv && \ - git checkout ${XMLTV_VER} && \ - echo "**** Perl 5.26 fixes for XMTLV ****" && \ - sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_latex && \ - sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_text && \ - sed "s/\(lib\/set_share_dir.pl';\)/.\/\1/" -i grab/it/tv_grab_it.PL && \ - sed "s/\(filter\/Grep.pm';\)/.\/\1/" -i filter/tv_grep.PL && \ - sed "s/\(lib\/XMLTV.pm.in';\)/.\/\1/" -i lib/XMLTV.pm.PL && \ - sed "s/\(lib\/Ask\/Term.pm';\)/.\/\1/" -i Makefile.PL && \ - PERL5LIB=`pwd` && \ - echo -e "yes" | perl Makefile.PL PREFIX=/usr/ INSTALLDIRS=vendor && \ - make -j 2 && \ - make test && \ - make DESTDIR=/tmp/xmltv-build install - RUN \ echo "**** compile tvheadend ****" && \ if [ -z ${TVHEADEND_COMMIT+x} ]; then \ @@ -262,71 +186,18 @@ RUN \ opus \ pcre2 \ perl \ - perl-archive-zip \ - perl-boolean \ - perl-capture-tiny \ - perl-cgi \ - perl-compress-raw-zlib \ - perl-date-manip \ - perl-datetime \ - perl-datetime-format-strptime \ - perl-datetime-timezone \ - perl-dbd-sqlite \ - perl-dbi \ - perl-digest-sha1 \ - perl-doc \ - perl-file-slurp \ - perl-file-temp \ - perl-file-which \ - perl-getopt-long \ - perl-html-parser \ - perl-html-tree \ - perl-http-cookies \ - perl-io \ - perl-io-html \ - perl-io-socket-ssl \ - perl-io-stringy \ - perl-json \ - perl-json-xs \ - perl-libwww \ - perl-lingua-en-numbers-ordinate \ - perl-lingua-preferred \ - perl-list-moreutils \ - perl-lwp-useragent-determined \ - perl-module-build \ - perl-module-pluggable \ - perl-net-ssleay \ - perl-parse-recdescent \ - perl-path-class \ - perl-scalar-list-utils \ - perl-term-progressbar \ - perl-term-readkey \ - perl-test-exception \ - perl-test-requires \ - perl-timedate \ - perl-try-tiny \ - perl-unicode-string \ - perl-xml-libxml \ - perl-xml-libxslt \ - perl-xml-parser \ - perl-xml-sax \ - perl-xml-treepp \ - perl-xml-twig \ - perl-xml-writer \ py3-requests \ python3 \ uriparser \ x264 \ x265 \ + xmltv \ zlib # copy local files and buildstage artifacts COPY --from=buildstage /tmp/argtable-build/usr/ /usr/ COPY --from=buildstage /tmp/comskip-build/usr/ /usr/ COPY --from=buildstage /tmp/tvheadend-build/usr/ /usr/ -COPY --from=buildstage /tmp/xmltv-build/usr/ /usr/ -COPY --from=buildstage /usr/local/share/man/ /usr/local/share/man/ -COPY --from=buildstage /usr/local/share/perl5/ /usr/local/share/perl5/ COPY --from=buildstage /picons /picons COPY root/ / diff --git a/patches/cpanfile b/patches/cpanfile deleted file mode 100644 index 349fb96..0000000 --- a/patches/cpanfile +++ /dev/null @@ -1,23 +0,0 @@ -requires 'perl' => '5.24.0'; - -# perl packages for tvheadend x86 -requires 'Data::Dump' ; -requires 'DateTime::Format::ISO8601' ; -requires 'DateTime::Format::SQLite' ; -requires 'Encode' ; -requires 'File::HomeDir' ; -requires 'File::Path' ; -requires 'HTML::Entities' ; -requires 'HTML::TableExtract' ; -requires 'HTTP::Cache::Transparent' => ">= 1.3, != 1.4" ; -requires 'inc' ; -requires 'JSON::PP' ; -requires 'LWP::Simple' ; -requires 'LWP::UserAgent' ; -requires 'PerlIO::gzip' ; -requires 'SOAP::Lite' ; -requires 'Storable' ; -requires 'Unicode::UTF8simple' ; -requires 'version' ; -requires 'WWW::Mechanize' ; -requires 'XML::DOM' ; diff --git a/readme-vars.yml b/readme-vars.yml index 8ff43c8..e55bf41 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -123,6 +123,7 @@ app_setup_block: | # changelog changelogs: + - { date: "18.05.23:", desc: "Install XMLTV from Alpine repos." } - { date: "18.05.23:", desc: "Rebase to Alpine 3.18." } - { date: "17.03.23:", desc: "Extract picons during build instead of init." } - { date: "23.02.23:", desc: "Rebase to Alpine 3.17, migrate to s6v3, drop armhf support." }