diff options
| author | decke <decke@FreeBSD.org> | 2013-11-18 20:03:42 +0800 |
|---|---|---|
| committer | decke <decke@FreeBSD.org> | 2013-11-18 20:03:42 +0800 |
| commit | 4a72f913d152fe5560b98412a801f191e959e106 (patch) | |
| tree | 118f6392f45357f3946116d201847f9660d52752 | |
| parent | 3c44a88dea9ab8d4da05c4ae434c82896b798089 (diff) | |
| download | freebsd-ports-gnome-4a72f913d152fe5560b98412a801f191e959e106.tar.gz freebsd-ports-gnome-4a72f913d152fe5560b98412a801f191e959e106.tar.zst freebsd-ports-gnome-4a72f913d152fe5560b98412a801f191e959e106.zip | |
- Update to 0.27
- Add staging support
- Convert optional dependencies to new format
- Add a few clang patches but switch to USE_GCC=any because there's quite some work left (contributors?)
31 files changed, 673 insertions, 319 deletions
diff --git a/audio/mythplugin-mythmusic/Makefile b/audio/mythplugin-mythmusic/Makefile index 3a3d73500e65..373e8a25adf1 100644 --- a/audio/mythplugin-mythmusic/Makefile +++ b/audio/mythplugin-mythmusic/Makefile @@ -2,30 +2,32 @@ # $FreeBSD$ PORTNAME= mythmusic -PORTVERSION= 0.26.1 +PORTVERSION= 0.27 CATEGORIES= audio -MASTER_SITES= http://ftp.osuosl.org/pub/mythtv/ \ - http://ftp.osuosl.org/pub/mythtv/old_releases/ \ - http://ftp.oregonstate.edu/pub/mythtv/ \ - http://ftp.oregonstate.edu/pub/mythtv/old_releases/ PKGNAMEPREFIX= mythplugin- -DISTNAME= mythplugins-${PORTVERSION} +DISTNAME= mythtv-${PORTVERSION} MAINTAINER= decke@FreeBSD.org COMMENT= Music playing plugin for MythTV -LIB_DEPENDS= cdio.13:${PORTSDIR}/sysutils/libcdio \ - FLAC:${PORTSDIR}/audio/flac \ - vorbis.4:${PORTSDIR}/audio/libvorbis \ - tag.1:${PORTSDIR}/audio/taglib \ - fftw3f:${PORTSDIR}/math/fftw3-float +LIB_DEPENDS= libcdio.so:${PORTSDIR}/sysutils/libcdio \ + libFLAC.so:${PORTSDIR}/audio/flac \ + libvorbis.so:${PORTSDIR}/audio/libvorbis \ + libtag.so:${PORTSDIR}/audio/taglib \ + libfftw3f.so:${PORTSDIR}/math/fftw3-float BUILD_DEPENDS= mythfrontend:${PORTSDIR}/multimedia/mythtv -USE_BZIP2= yes -NO_STAGE= yes +USE_GITHUB= yes +GH_ACCOUNT= MythTV +GH_PROJECT= mythtv +GH_TAGNAME= v${PORTVERSION} + +WRKSRC= ${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-e9545c0/mythplugins + USE_QT4= linguist_build moc_build qmake_build rcc_build uic_build HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/lib/mythtv/plugins +DESTDIRNAME= INSTALL_ROOT PLIST_SUB+= MYTHSHARE="share/mythtv" diff --git a/audio/mythplugin-mythmusic/distinfo b/audio/mythplugin-mythmusic/distinfo index 9eb79c986f0e..66c307cfbe08 100644 --- a/audio/mythplugin-mythmusic/distinfo +++ b/audio/mythplugin-mythmusic/distinfo @@ -1,2 +1,2 @@ -SHA256 (mythplugins-0.26.1.tar.bz2) = 6db50887dac35471b408cc8365c84f2a8522be7045b8e81de13ff16d840fc928 -SIZE (mythplugins-0.26.1.tar.bz2) = 36718864 +SHA256 (mythtv-0.27.tar.gz) = e8d77c48f487bd057b2f887c27416d502b79c78c4e1cfb05d87ec70d690f8d0d +SIZE (mythtv-0.27.tar.gz) = 85915149 diff --git a/audio/mythplugin-mythmusic/files/patch-configure b/audio/mythplugin-mythmusic/files/patch-configure index 97364c01fe8d..b2ea71eb1643 100644 --- a/audio/mythplugin-mythmusic/files/patch-configure +++ b/audio/mythplugin-mythmusic/files/patch-configure @@ -1,5 +1,5 @@ ---- configure.orig 2012-04-10 07:29:22.000000000 +0200 -+++ configure 2012-04-13 22:04:24.501203271 +0200 +--- configure.orig 2013-09-18 20:06:08.000000000 +0000 ++++ configure 2013-10-16 15:21:39.000000000 +0000 @@ -227,6 +227,10 @@ append ECXXFLAGS "$@" } @@ -11,18 +11,18 @@ check_cxx(){ log check_cxx "$@" cat > $TMPCXX -@@ -555,6 +559,10 @@ - CXXPPFLAGS=${CXXPPFLAGS#CXXPPFLAGS=} - OPENGLV=$(cat mythconfig.mak | grep -e "^CONFIG_OPENGL_VIDEO=yes") +@@ -561,6 +565,10 @@ + EXTRALIBS=$(cat mythconfig.mak | grep -e "^EXTRALIBS=") + EXTRALIBS=${EXTRALIBS#EXTRALIBS=} +add_cppflags "-I${prefix}/include" +add_cxxflags "-I${prefix}/include" +add_ldflags "-L${prefix}/lib" + - if ! is_qmake4 $qmake; then - is_qmake4 qmake-qt4 && qmake=qmake-qt4 || die "qmake for Qt4.6 or newer not found.\nPlease specify the correct qmake with --qmake=" - fi -@@ -646,6 +654,7 @@ + if ! is_qmake5 $qmake ; then + if ! is_qmake4 $qmake; then + is_qmake4 qmake-qt4 && qmake=qmake-qt4 || die "qmake for Qt4.8 or newer not found.\nPlease specify the correct qmake with --qmake=" +@@ -653,6 +661,7 @@ echo "MythMusic requires FLAC." fi diff --git a/audio/mythplugin-mythmusic/pkg-plist b/audio/mythplugin-mythmusic/pkg-plist index b78d2d177c6d..1b1631e20ab7 100644 --- a/audio/mythplugin-mythmusic/pkg-plist +++ b/audio/mythplugin-mythmusic/pkg-plist @@ -1,4 +1,3 @@ -@comment $FreeBSD$ lib/mythtv/plugins/libmythmusic.so %%MYTHSHARE%%/i18n/mythmusic_ca.qm %%MYTHSHARE%%/i18n/mythmusic_cs.qm @@ -48,6 +47,7 @@ lib/mythtv/plugins/libmythmusic.so %%MYTHSHARE%%/themes/default/mm_blackhole_border.png %%MYTHSHARE%%/themes/default/mm_browser_back_reg.png %%MYTHSHARE%%/themes/default/mm_browser_back_sel.png +%%MYTHSHARE%%/themes/default/mm_cd.png %%MYTHSHARE%%/themes/default/mm_compartists.png %%MYTHSHARE%%/themes/default/mm_compilations.png %%MYTHSHARE%%/themes/default/mm_descending.png @@ -121,6 +121,5 @@ lib/mythtv/plugins/libmythmusic.so %%MYTHSHARE%%/themes/default/stop_button_pushed.png %%MYTHSHARE%%/themes/default/stream-ui.xml %%MYTHSHARE%%/themes/default/track_info_background.png -@dirrmtry lib/pkgconfig @dirrmtry lib/mythtv/plugins @dirrm %%MYTHSHARE%%/mythmusic diff --git a/multimedia/mythtv-frontend/Makefile b/multimedia/mythtv-frontend/Makefile index 6efe1c5e9773..8303c22ddd18 100644 --- a/multimedia/mythtv-frontend/Makefile +++ b/multimedia/mythtv-frontend/Makefile @@ -2,12 +2,8 @@ # $FreeBSD$ PORTNAME= mythtv-frontend -PORTVERSION= 0.26.1 +PORTVERSION= 0.27 CATEGORIES= multimedia -MASTER_SITES= http://ftp.osuosl.org/pub/mythtv/ \ - http://ftp.osuosl.org/pub/mythtv/old_releases/ \ - http://ftp.oregonstate.edu/pub/mythtv/ \ - http://ftp.oregonstate.edu/pub/mythtv/old_releases/ DISTNAME= mythtv-${PORTVERSION} MAINTAINER= decke@FreeBSD.org @@ -15,20 +11,30 @@ COMMENT= MythTV is a homebrew PVR project BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat \ yasm:${PORTSDIR}/devel/yasm -LIB_DEPENDS= mp3lame.0:${PORTSDIR}/audio/lame \ - freetype.9:${PORTSDIR}/print/freetype2 +LIB_DEPENDS= libmp3lame.so:${PORTSDIR}/audio/lame \ + libfreetype.so:${PORTSDIR}/print/freetype2 \ + libtag.so:${PORTSDIR}/audio/taglib \ + libxml2.so:${PORTSDIR}/textproc/libxml2 CONFLICTS= mythtv-[0-9]* +USE_GITHUB= yes +GH_ACCOUNT= MythTV +GH_PROJECT= mythtv +GH_TAGNAME= v${PORTVERSION} + +WRKSRC= ${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-e9545c0/${GH_PROJECT} + +USE_GCC= any ONLY_FOR_ARCHS= i386 amd64 -USE_BZIP2= yes +USES= gmake pkgconfig USE_QT4= gui sql network script linguist_build l10n sql-mysql_run \ moc_build qmake_build rcc_build uic_build QT_NONSTANDARD= yes -USE_GMAKE= yes HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/lib/mythtv/filters REINPLACE_ARGS= -i "" +DESTDIRNAME= INSTALL_ROOT DATADIR= ${PREFIX}/share/mythtv @@ -38,9 +44,10 @@ MAKE_ENV= QTDIR="${QT_PREFIX}" \ CPPFLAGS+= ${QTCPPFLAGS} CONFIGURE_ENV+= QMAKESPEC="${QMAKESPEC}" MOC="${MOC}" \ QTDIR="${QT_PREFIX}" +LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ARGS= --prefix="${PREFIX}" --disable-audio-alsa --disable-indev=alsa \ - --disable-outdev=alsa --disable-firewire --disable-iptv \ +CONFIGURE_ARGS= --prefix="${PREFIX}" --cc="${CC}" --cxx="${CXX}" --libxml2-path="${LOCALBASE}/include/libxml2" \ + --disable-audio-alsa --disable-indev=alsa --disable-outdev=alsa --disable-firewire \ --disable-hdhomerun --disable-v4l2 --disable-ivtv --disable-hdpvr \ --disable-dvb --enable-opengl-video --without-bindings=perl,python,php @@ -52,7 +59,17 @@ DESKTOP_ENTRIES="MythTV Frontend" "MythTV is a homebrew PVR project" "" \ OPTIONS_DEFINE= OPENGL JACK PULSEAUDIO VDPAU OPTIONS_DEFAULT= OPENGL -NO_STAGE= yes +JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack +JACK_CONFIGURE_ENABLE= audio-jack + +PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio +PULSEAUDIO_CONFIGURE_ENABLE= audio-pulseoutput + +VDPAU_LIB_DEPENDS= libvdpau.so:${PORTSDIR}/multimedia/libvdpau +VDPAU_CONFIGURE_ENABLE= vdpau + +OPENGL_CONFIGURE_ENABLE= opengl-video + .include <bsd.port.pre.mk> # for too old binutils in base @@ -62,32 +79,8 @@ CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin .endif -.if ${PORT_OPTIONS:MJACK} -LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack -CONFIGURE_ARGS+= --enable-audio-jack -.else -CONFIGURE_ARGS+= --disable-audio-jack -.endif - .if ${PORT_OPTIONS:MOPENGL} USE_QT4+= opengl -CONFIGURE_ARGS+= --enable-opengl-video -.else -CONFIGURE_ARGS+= --disable-opengl-video -.endif - -.if ${PORT_OPTIONS:MPULSEAUDIO} -LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio -CONFIGURE_ARGS+= --enable-audio-pulseoutput -.else -CONFIGURE_ARGS+= --disable-audio-pulseoutput -.endif - -.if ${PORT_OPTIONS:MVDPAU} -LIB_DEPENDS+= vdpau.1:${PORTSDIR}/multimedia/libvdpau -CONFIGURE_ARGS+= --enable-vdpau -.else -CONFIGURE_ARGS+= --disable-vdpau .endif post-patch: diff --git a/multimedia/mythtv-frontend/distinfo b/multimedia/mythtv-frontend/distinfo index c7a2ea35033e..66c307cfbe08 100644 --- a/multimedia/mythtv-frontend/distinfo +++ b/multimedia/mythtv-frontend/distinfo @@ -1,2 +1,2 @@ -SHA256 (mythtv-0.26.1.tar.bz2) = 4ede371637f74d7442ddcec8e6968775d1c11377dd8907deac720e957707b3fa -SIZE (mythtv-0.26.1.tar.bz2) = 40871547 +SHA256 (mythtv-0.27.tar.gz) = e8d77c48f487bd057b2f887c27416d502b79c78c4e1cfb05d87ec70d690f8d0d +SIZE (mythtv-0.27.tar.gz) = 85915149 diff --git a/multimedia/mythtv-frontend/files/patch-configure b/multimedia/mythtv-frontend/files/patch-configure index ec18184b8f97..bf2acae42795 100644 --- a/multimedia/mythtv-frontend/files/patch-configure +++ b/multimedia/mythtv-frontend/files/patch-configure @@ -1,31 +1,39 @@ ---- configure.orig 2012-10-02 12:30:24.000000000 +0200 -+++ configure 2012-10-03 19:27:16.773415414 +0200 -@@ -731,21 +731,21 @@ +--- configure.orig 2013-09-18 20:06:08.000000000 +0000 ++++ configure 2013-10-18 11:11:10.000000000 +0000 +@@ -846,28 +846,28 @@ log check_cc "$@" cat > $TMPC log_file $TMPC -- check_cmd $cc $CPPFLAGS $CFLAGS "$@" -c -o $TMPO $TMPC -+ check_cmd $cc $CPPFLAGS $CFLAGS -I${prefix}/include "$@" -c -o $TMPO $TMPC +- check_cmd $cc $CPPFLAGS $CFLAGS "$@" $CC_C $(cc_o $TMPO) $TMPC ++ check_cmd $cc $CPPFLAGS $CFLAGS -I${prefix}/include "$@" $CC_C $(cc_o $TMPO) $TMPC } check_cxx(){ log check_cxx "$@" cat > $TMPCPP log_file $TMPCPP -- check_cmd $cxx $CPPFLAGS $CXXFLAGS "$@" -c -o $TMPO $TMPCPP -+ check_cmd $cxx $CPPFLAGS $CXXFLAGS -I${prefix}/include "$@" -c -o $TMPO $TMPCPP +- check_cmd $cxx $CPPFLAGS $CXXFLAGS "$@" $CXX_C -o $TMPO $TMPCPP ++ check_cmd $cxx $CPPFLAGS $CXXFLAGS -I${prefix}/include "$@" $CXX_C -o $TMPO $TMPCPP + } + + check_ecxx(){ + log check_cxx "$@" + cat > $TMPCPP + log_file $TMPCPP +- check_cmd $cxx $CPPFLAGS $CXXFLAGS $ECXXFLAGS "$@" $CXX_C -o $TMPO $TMPCPP ++ check_cmd $cxx $CPPFLAGS $CXXFLAGS $ECXXFLAGS -I${prefix}/include "$@" $CXX_C -o $TMPO $TMPCPP } check_cpp(){ log check_cpp "$@" cat > $TMPC log_file $TMPC -- check_cmd $cc $CPPFLAGS $CFLAGS "$@" -E -o $TMPO $TMPC -+ check_cmd $cc $CPPFLAGS $CFLAGS -I${prefix}/include "$@" -E -o $TMPO $TMPC +- check_cmd $cc $CPPFLAGS $CFLAGS "$@" $(cc_e $TMPO) $TMPC ++ check_cmd $cc $CPPFLAGS $CFLAGS -I${prefix}/include "$@" $(cc_e $TMPO) $TMPC } - check_as(){ -@@ -2152,7 +2152,7 @@ + as_o(){ +@@ -2539,7 +2539,7 @@ # machine arch_default=$(uname -m) @@ -34,8 +42,8 @@ processor=`uname -p 2>/dev/null` processor_flags="" tune="generic" -@@ -3185,7 +3185,7 @@ - i686|pentiumpro|pentium[23]|pentium-m|athlon|athlon-tbird|athlon-4|athlon-[mx]p|athlon64*|k8*|opteron*|athlon-fx|core2|amdfam10|barcelona|atom) +@@ -3931,7 +3931,7 @@ + i686|pentiumpro|pentium[23]|pentium-m|athlon|athlon-tbird|athlon-4|athlon-[mx]p|athlon64*|k8*|opteron*|athlon-fx|core2|corei7*|amdfam10|barcelona|atom|bdver*) cpuflags="-march=$cpu" enable cmov - enable fast_cmov @@ -43,7 +51,7 @@ ;; # targets that do support conditional mov but on which it's slow pentium4|pentium4m|prescott|nocona) -@@ -3401,7 +3401,6 @@ +@@ -4102,7 +4102,6 @@ append CCONFIG "freebsd" # Workaround compile errors from missing u_int/uint def CPPFLAGS=`echo $CPPFLAGS | sed 's/-D_POSIX_C_SOURCE=200112//'` @@ -51,16 +59,15 @@ enable backend ;; bsd/os) -@@ -5427,6 +5426,8 @@ +@@ -6383,6 +6382,7 @@ QMAKE_LIBDIR_QT-=${sysroot}${libdir} QMAKE_LIBDIR-=${sysroot}${libdir} LATE_LIBS+=-L${sysroot}${libdir} -+CONFIG_INCLUDEPATH= +FREETYPE_CFLAGS-= -I/usr/local/include EOF #echo "endif # FFMPEG_CONFIG_MAK" >> $TMPMAK -@@ -5477,7 +5478,7 @@ +@@ -6435,7 +6435,7 @@ BINDIR=\$(INSTALL_ROOT)$bindir DATADIR=\$(INSTALL_ROOT)$datadir MANDIR=\$(INSTALL_ROOT)$mandir diff --git a/multimedia/mythtv-frontend/files/patch-external__FFmpeg__libavcodec__x86__ac3dsp_init.c b/multimedia/mythtv-frontend/files/patch-external__FFmpeg__libavcodec__x86__ac3dsp_init.c new file mode 100644 index 000000000000..7c8f5758f0c7 --- /dev/null +++ b/multimedia/mythtv-frontend/files/patch-external__FFmpeg__libavcodec__x86__ac3dsp_init.c @@ -0,0 +1,11 @@ +--- external/FFmpeg/libavcodec/x86/ac3dsp_init.c.orig 2013-09-18 20:06:08.000000000 +0000 ++++ external/FFmpeg/libavcodec/x86/ac3dsp_init.c 2013-10-18 11:58:01.000000000 +0000 +@@ -51,7 +51,7 @@ + extern void ff_ac3_extract_exponents_sse2 (uint8_t *exp, int32_t *coef, int nb_coefs); + extern void ff_ac3_extract_exponents_ssse3(uint8_t *exp, int32_t *coef, int nb_coefs); + +-#if ARCH_X86_32 && defined(__INTEL_COMPILER) ++#if ARCH_X86_32 && (defined(__INTEL_COMPILER) || defined(__clang__)) + # undef HAVE_7REGS + # define HAVE_7REGS 0 + #endif diff --git a/multimedia/mythtv-frontend/files/patch-libs__libmythbase__logging.cpp b/multimedia/mythtv-frontend/files/patch-libs__libmythbase__logging.cpp new file mode 100644 index 000000000000..776697497968 --- /dev/null +++ b/multimedia/mythtv-frontend/files/patch-libs__libmythbase__logging.cpp @@ -0,0 +1,20 @@ +--- libs/libmythbase/logging.cpp.orig 2013-09-18 20:06:08.000000000 +0000 ++++ libs/libmythbase/logging.cpp 2013-10-18 14:57:43.000000000 +0000 +@@ -859,7 +859,7 @@ + #ifndef _WIN32 + if (logPropagateOpts.facility >= 0) + { +- CODE *syslogname; ++ const CODE *syslogname; + + for (syslogname = &facilitynames[0]; + (syslogname->c_name && +@@ -996,7 +996,7 @@ + "Windows does not support syslog, disabling" ); + return( -2 ); + #else +- CODE *name; ++ const CODE *name; + int i; + QByteArray ba = facility.toLocal8Bit(); + char *string = (char *)ba.constData(); diff --git a/multimedia/mythtv-frontend/files/patch-libs__libmythbase__mythmiscutil.h b/multimedia/mythtv-frontend/files/patch-libs__libmythbase__mythmiscutil.h new file mode 100644 index 000000000000..a55e0e21126e --- /dev/null +++ b/multimedia/mythtv-frontend/files/patch-libs__libmythbase__mythmiscutil.h @@ -0,0 +1,10 @@ +--- libs/libmythbase/mythmiscutil.h.orig 2013-09-18 20:06:08.000000000 +0000 ++++ libs/libmythbase/mythmiscutil.h 2013-10-18 12:23:08.000000000 +0000 +@@ -2,6 +2,7 @@ + #define MYTHMISCUTIL_H_ + + #include <stdint.h> ++#include <time.h> + + #include <algorithm> + using namespace std; diff --git a/multimedia/mythtv-frontend/files/patch-libs__libmythbase__mythsystemlegacy.h b/multimedia/mythtv-frontend/files/patch-libs__libmythbase__mythsystemlegacy.h new file mode 100644 index 000000000000..41b4031a6193 --- /dev/null +++ b/multimedia/mythtv-frontend/files/patch-libs__libmythbase__mythsystemlegacy.h @@ -0,0 +1,10 @@ +--- libs/libmythbase/mythsystemlegacy.h.orig 2013-09-18 20:06:08.000000000 +0000 ++++ libs/libmythbase/mythsystemlegacy.h 2013-10-18 11:37:16.000000000 +0000 +@@ -42,6 +42,7 @@ + + // C headers + #include <stdint.h> ++#include <time.h> + + #ifdef __cplusplus + diff --git a/multimedia/mythtv-frontend/files/patch-libs__libmythbase__mythtimer.cpp b/multimedia/mythtv-frontend/files/patch-libs__libmythbase__mythtimer.cpp new file mode 100644 index 000000000000..71d62ca60099 --- /dev/null +++ b/multimedia/mythtv-frontend/files/patch-libs__libmythbase__mythtimer.cpp @@ -0,0 +1,11 @@ +--- libs/libmythbase/mythtimer.cpp.orig 2013-09-18 20:06:08.000000000 +0000 ++++ libs/libmythbase/mythtimer.cpp 2013-10-22 11:03:36.000000000 +0000 +@@ -19,6 +19,8 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + ++#include <stdint.h> ++ + // MythTV includes + #include "mythtimer.h" + diff --git a/multimedia/mythtv-frontend/files/patch-libs__libmythbase__mythtimezone.cpp b/multimedia/mythtv-frontend/files/patch-libs__libmythbase__mythtimezone.cpp new file mode 100644 index 000000000000..14436c1aee6a --- /dev/null +++ b/multimedia/mythtv-frontend/files/patch-libs__libmythbase__mythtimezone.cpp @@ -0,0 +1,10 @@ +--- libs/libmythbase/mythtimezone.cpp.orig 2013-09-18 20:06:08.000000000 +0000 ++++ libs/libmythbase/mythtimezone.cpp 2013-10-18 16:01:39.000000000 +0000 +@@ -1,6 +1,7 @@ + #include "mythtimezone.h" + + #include <stdlib.h> // for malloc, getenv ++#include <time.h> + + #include <QDataStream> + #include <QTextStream> diff --git a/multimedia/mythtv-frontend/files/patch-libs__libmythtv__dvbstreamhandler.cpp b/multimedia/mythtv-frontend/files/patch-libs__libmythtv__recorders__dvbstreamhandler.cpp index 58e4dd25d624..bf96bcb6ad9f 100644 --- a/multimedia/mythtv-frontend/files/patch-libs__libmythtv__dvbstreamhandler.cpp +++ b/multimedia/mythtv-frontend/files/patch-libs__libmythtv__recorders__dvbstreamhandler.cpp @@ -1,5 +1,5 @@ ---- libs/libmythtv/dvbstreamhandler.cpp.orig 2012-03-05 03:31:31.000000000 +0100 -+++ libs/libmythtv/dvbstreamhandler.cpp 2012-03-18 11:24:44.309770699 +0100 +--- libs/libmythtv/recorders/dvbstreamhandler.cpp.orig 2012-03-05 03:31:31.000000000 +0100 ++++ libs/libmythtv/recorders/dvbstreamhandler.cpp 2012-03-18 11:24:44.309770699 +0100 @@ -614,7 +614,7 @@ { struct dmx_pes_filter_params pesFilterParams; diff --git a/multimedia/mythtv-frontend/pkg-plist b/multimedia/mythtv-frontend/pkg-plist index 5218150d6c48..c6b0a1487fcf 100644 --- a/multimedia/mythtv-frontend/pkg-plist +++ b/multimedia/mythtv-frontend/pkg-plist @@ -1,8 +1,9 @@ -@comment $FreeBSD$ bin/mythavtest bin/mythccextractor bin/mythcommflag bin/mythffmpeg +bin/mythffprobe +bin/mythffserver bin/mythfrontend bin/mythjobqueue bin/mythlcdserver @@ -10,6 +11,7 @@ bin/mythlogserver bin/mythmediaserver bin/mythpreviewgen bin/mythreplex +bin/mythscreenwizard bin/mythshutdown bin/mythtranscode bin/mythutil @@ -23,18 +25,21 @@ include/mythtv/QJson/qjson_export.h include/mythtv/QJson/qobjecthelper.h include/mythtv/QJson/serializer.h include/mythtv/QJson/serializerrunnable.h +include/mythtv/audioconvert.h include/mythtv/audiooutput.h include/mythtv/audiooutputsettings.h +include/mythtv/audiooutpututil.h include/mythtv/audiosettings.h include/mythtv/autodeletedeque.h -include/mythtv/bswap.h include/mythtv/bluray/attributes.h +include/mythtv/bluray/bdid_parse.h include/mythtv/bluray/bdparse.h include/mythtv/bluray/bits.h include/mythtv/bluray/bluray.h include/mythtv/bluray/clpi_data.h include/mythtv/bluray/clpi_parse.h include/mythtv/bluray/dl.h +include/mythtv/bluray/extdata_parse.h include/mythtv/bluray/file.h include/mythtv/bluray/file_mythiowrapper.h include/mythtv/bluray/filesystem.h @@ -54,6 +59,7 @@ include/mythtv/bluray/sound_parse.h include/mythtv/bluray/strutl.h include/mythtv/bluray/uo_mask_table.h include/mythtv/bonjourregister.h +include/mythtv/bswap.h include/mythtv/compat.h include/mythtv/dbutil.h include/mythtv/dialogbox.h @@ -70,21 +76,21 @@ include/mythtv/exitcodes.h include/mythtv/ffmpeg-mmx.h include/mythtv/filesysteminfo.h include/mythtv/hardwareprofile.h -include/mythtv/httpcomms.h include/mythtv/iso3166.h include/mythtv/iso639.h include/mythtv/langsettings.h include/mythtv/lcddevice.h -include/mythtv/loggingserver.h include/mythtv/libavcodec/avcodec.h include/mythtv/libavcodec/avfft.h include/mythtv/libavcodec/dxva2.h +include/mythtv/libavcodec/old_codec_ids.h include/mythtv/libavcodec/vaapi.h include/mythtv/libavcodec/vda.h include/mythtv/libavcodec/vdpau.h include/mythtv/libavcodec/version.h include/mythtv/libavcodec/xvmc.h include/mythtv/libavdevice/avdevice.h +include/mythtv/libavdevice/version.h include/mythtv/libavfilter/asrc_abuffer.h include/mythtv/libavfilter/avcodec.h include/mythtv/libavfilter/avfilter.h @@ -92,7 +98,6 @@ include/mythtv/libavfilter/avfiltergraph.h include/mythtv/libavfilter/buffersink.h include/mythtv/libavfilter/buffersrc.h include/mythtv/libavfilter/version.h -include/mythtv/libavfilter/vsrc_buffer.h include/mythtv/libavformat/avformat.h include/mythtv/libavformat/avio.h include/mythtv/libavformat/version.h @@ -106,8 +111,10 @@ include/mythtv/libavutil/avconfig.h include/mythtv/libavutil/avstring.h include/mythtv/libavutil/avutil.h include/mythtv/libavutil/base64.h +include/mythtv/libavutil/blowfish.h include/mythtv/libavutil/bprint.h include/mythtv/libavutil/bswap.h +include/mythtv/libavutil/channel_layout.h include/mythtv/libavutil/common.h include/mythtv/libavutil/cpu.h include/mythtv/libavutil/crc.h @@ -116,9 +123,10 @@ include/mythtv/libavutil/error.h include/mythtv/libavutil/eval.h include/mythtv/libavutil/fifo.h include/mythtv/libavutil/file.h +include/mythtv/libavutil/hmac.h include/mythtv/libavutil/imgutils.h -include/mythtv/libavutil/intfloat_readwrite.h include/mythtv/libavutil/intfloat.h +include/mythtv/libavutil/intfloat_readwrite.h include/mythtv/libavutil/intreadwrite.h include/mythtv/libavutil/lfg.h include/mythtv/libavutil/log.h @@ -126,6 +134,7 @@ include/mythtv/libavutil/lzo.h include/mythtv/libavutil/mathematics.h include/mythtv/libavutil/md5.h include/mythtv/libavutil/mem.h +include/mythtv/libavutil/old_pix_fmts.h include/mythtv/libavutil/opt.h include/mythtv/libavutil/parseutils.h include/mythtv/libavutil/pixdesc.h @@ -134,10 +143,15 @@ include/mythtv/libavutil/random_seed.h include/mythtv/libavutil/rational.h include/mythtv/libavutil/samplefmt.h include/mythtv/libavutil/sha.h +include/mythtv/libavutil/time.h include/mythtv/libavutil/timecode.h include/mythtv/libavutil/timestamp.h +include/mythtv/libavutil/version.h +include/mythtv/libavutil/xtea.h +include/mythtv/libmyth/audioconvert.h include/mythtv/libmyth/audiooutput.h include/mythtv/libmyth/audiooutputsettings.h +include/mythtv/libmyth/audiooutpututil.h include/mythtv/libmyth/audiosettings.h include/mythtv/libmyth/dialogbox.h include/mythtv/libmyth/eldutils.h @@ -148,8 +162,6 @@ include/mythtv/libmyth/mythcontext.h include/mythtv/libmyth/mythdialogs.h include/mythtv/libmyth/mythexp.h include/mythtv/libmyth/mythmediamonitor.h -include/mythtv/libmyth/mythplugin.h -include/mythtv/libmyth/mythpluginapi.h include/mythtv/libmyth/mythrssmanager.h include/mythtv/libmyth/mythterminal.h include/mythtv/libmyth/mythwidgets.h @@ -181,13 +193,11 @@ include/mythtv/libmythbase/exitcodes.h include/mythtv/libmythbase/ffmpeg-mmx.h include/mythtv/libmythbase/filesysteminfo.h include/mythtv/libmythbase/hardwareprofile.h -include/mythtv/libmythbase/httpcomms.h include/mythtv/libmythbase/iso3166.h include/mythtv/libmythbase/iso639.h include/mythtv/libmythbase/lcddevice.h include/mythtv/libmythbase/loggingserver.h include/mythtv/libmythbase/mcodecs.h -include/mythtv/libmythbase/msocketdevice.h include/mythtv/libmythbase/mthread.h include/mythtv/libmythbase/mthreadpool.h include/mythtv/libmythbase/mythbaseexp.h @@ -205,24 +215,31 @@ include/mythtv/libmythbase/mythdeque.h include/mythtv/libmythbase/mythdirs.h include/mythtv/libmythbase/mythdownloadmanager.h include/mythtv/libmythbase/mythevent.h -include/mythtv/libmythbase/mythhttppool.h include/mythtv/libmythbase/mythlocale.h include/mythtv/libmythbase/mythlogging.h include/mythtv/libmythbase/mythmedia.h include/mythtv/libmythbase/mythmiscutil.h include/mythtv/libmythbase/mythobservable.h -include/mythtv/libmythbase/signalhandling.h +include/mythtv/libmythbase/mythplugin.h +include/mythtv/libmythbase/mythpluginapi.h +include/mythtv/libmythbase/mythqtcompat.h include/mythtv/libmythbase/mythsocket.h include/mythtv/libmythbase/mythsocket_cb.h include/mythtv/libmythbase/mythstorage.h include/mythtv/libmythbase/mythsystem.h +include/mythtv/libmythbase/mythsystemlegacy.h include/mythtv/libmythbase/mythtimer.h include/mythtv/libmythbase/mythtranslation.h +include/mythtv/libmythbase/mythtypes.h include/mythtv/libmythbase/mythversion.h include/mythtv/libmythbase/plist.h include/mythtv/libmythbase/referencecounter.h +include/mythtv/libmythbase/referencecounterlist.h +include/mythtv/libmythbase/remotefile.h include/mythtv/libmythbase/serverpool.h +include/mythtv/libmythbase/signalhandling.h include/mythtv/libmythbase/storagegroup.h +include/mythtv/libmythbase/threadedfilewriter.h include/mythtv/libmythbase/verbosedefs.h include/mythtv/libmythbase/version.h include/mythtv/libmythservicecontracts/datacontracthelper.h @@ -249,6 +266,8 @@ include/mythtv/libmythservicecontracts/datacontracts/recRuleList.h include/mythtv/libmythservicecontracts/datacontracts/recording.h include/mythtv/libmythservicecontracts/datacontracts/settingList.h include/mythtv/libmythservicecontracts/datacontracts/timeZoneInfo.h +include/mythtv/libmythservicecontracts/datacontracts/titleInfo.h +include/mythtv/libmythservicecontracts/datacontracts/titleInfoList.h include/mythtv/libmythservicecontracts/datacontracts/versionInfo.h include/mythtv/libmythservicecontracts/datacontracts/videoLookupInfo.h include/mythtv/libmythservicecontracts/datacontracts/videoLookupInfoList.h @@ -275,8 +294,9 @@ include/mythtv/libmythui/mythgenerictree.h include/mythtv/libmythui/mythgesture.h include/mythtv/libmythui/mythimage.h include/mythtv/libmythui/mythmainwindow.h +include/mythtv/libmythui/mythnotification.h +include/mythtv/libmythui/mythnotificationcenter.h include/mythtv/libmythui/mythpainter.h -include/mythtv/libmythui/mythpainter_ogl.h include/mythtv/libmythui/mythpainter_qt.h include/mythtv/libmythui/mythprogressdialog.h include/mythtv/libmythui/mythrect.h @@ -291,6 +311,7 @@ include/mythtv/libmythui/mythuibuttonlist.h include/mythtv/libmythui/mythuibuttontree.h include/mythtv/libmythui/mythuicheckbox.h include/mythtv/libmythui/mythuiclock.h +include/mythtv/libmythui/mythuicomposite.h include/mythtv/libmythui/mythuieditbar.h include/mythtv/libmythui/mythuiexp.h include/mythtv/libmythui/mythuifilebrowser.h @@ -316,8 +337,12 @@ include/mythtv/libmythui/themeinfo.h include/mythtv/libmythui/x11colors.h include/mythtv/libmythui/xmlparsebase.h include/mythtv/libpostproc/postprocess.h +include/mythtv/libpostproc/version.h include/mythtv/libswresample/swresample.h +include/mythtv/libswresample/version.h include/mythtv/libswscale/swscale.h +include/mythtv/libswscale/version.h +include/mythtv/loggingserver.h include/mythtv/mcodecs.h include/mythtv/metadata/bluraymetadata.h include/mythtv/metadata/cleanup.h @@ -329,6 +354,16 @@ include/mythtv/metadata/metadatadownload.h include/mythtv/metadata/metadatafactory.h include/mythtv/metadata/metadataimagedownload.h include/mythtv/metadata/metadataimagehelper.h +include/mythtv/metadata/metaio.h +include/mythtv/metadata/metaioavfcomment.h +include/mythtv/metadata/metaioflacvorbis.h +include/mythtv/metadata/metaioid3.h +include/mythtv/metadata/metaiomp4.h +include/mythtv/metadata/metaiooggvorbis.h +include/mythtv/metadata/metaiotaglib.h +include/mythtv/metadata/metaiowavpack.h +include/mythtv/metadata/musicmetadata.h +include/mythtv/metadata/musicutils.h include/mythtv/metadata/mythmetaexp.h include/mythtv/metadata/mythuiimageresults.h include/mythtv/metadata/mythuimetadataresults.h @@ -340,7 +375,6 @@ include/mythtv/metadata/videoscan.h include/mythtv/metadata/videoutils.h include/mythtv/metadataimagehelper.h include/mythtv/mpeg2dec/mpeg2.h -include/mythtv/msocketdevice.h include/mythtv/mthread.h include/mythtv/mthreadpool.h include/mythtv/mythbaseexp.h @@ -363,7 +397,6 @@ include/mythtv/mythdirs.h include/mythtv/mythdownloadmanager.h include/mythtv/mythevent.h include/mythtv/mythexp.h -include/mythtv/mythhttppool.h include/mythtv/mythlocale.h include/mythtv/mythlogging.h include/mythtv/mythmedia.h @@ -372,15 +405,18 @@ include/mythtv/mythmiscutil.h include/mythtv/mythobservable.h include/mythtv/mythplugin.h include/mythtv/mythpluginapi.h +include/mythtv/mythqtcompat.h include/mythtv/mythrssmanager.h include/mythtv/mythsocket.h include/mythtv/mythsocket_cb.h include/mythtv/mythstorage.h include/mythtv/mythsystem.h +include/mythtv/mythsystemlegacy.h include/mythtv/mythterminal.h include/mythtv/mythtimer.h include/mythtv/mythtranslation.h include/mythtv/mythtvexp.h +include/mythtv/mythtypes.h include/mythtv/mythversion.h include/mythtv/mythwidgets.h include/mythtv/mythwizard.h @@ -395,6 +431,7 @@ include/mythtv/programinfo.h include/mythtv/programtypes.h include/mythtv/recordingtypes.h include/mythtv/referencecounter.h +include/mythtv/referencecounterlist.h include/mythtv/remotefile.h include/mythtv/remoteutil.h include/mythtv/rssparse.h @@ -405,6 +442,7 @@ include/mythtv/settings.h include/mythtv/signalhandling.h include/mythtv/storagegroup.h include/mythtv/storagegroupeditor.h +include/mythtv/threadedfilewriter.h include/mythtv/uitypes.h include/mythtv/upnp/bufferedsocketdevice.h include/mythtv/upnp/configuration.h @@ -445,76 +483,74 @@ include/mythtv/xmlparse.h include/mythtv/zeromq/zmq.h include/mythtv/zeromq/zmq.hpp include/mythtv/zeromq/zmq_utils.h -lib/libmyth-0.26.so -lib/libmyth-0.26.so.0 -lib/libmyth-0.26.so.0.26 -lib/libmyth-0.26.so.0.26.0 +lib/libmyth-0.27.so +lib/libmyth-0.27.so.0 +lib/libmyth-0.27.so.0.27 +lib/libmyth-0.27.so.0.27.0 lib/libmythavcodec.so lib/libmythavcodec.so.54 -lib/libmythavcodec.so.54.23.100 +lib/libmythavcodec.so.54.92.100 lib/libmythavdevice.so lib/libmythavdevice.so.54 -lib/libmythavdevice.so.54.0.100 +lib/libmythavdevice.so.54.3.103 lib/libmythavfilter.so -lib/libmythavfilter.so.2 -lib/libmythavfilter.so.2.77.100 +lib/libmythavfilter.so.3 +lib/libmythavfilter.so.3.42.103 lib/libmythavformat.so lib/libmythavformat.so.54 -lib/libmythavformat.so.54.6.101 +lib/libmythavformat.so.54.63.104 lib/libmythavutil.so -lib/libmythavutil.so.51 -lib/libmythavutil.so.51.56.100 -lib/libmythbase-0.26.so -lib/libmythbase-0.26.so.0 -lib/libmythbase-0.26.so.0.26 -lib/libmythbase-0.26.so.0.26.0 -lib/libmythbluray-0.26.a -lib/libmythdvdnav-0.26.a -lib/libmythfreemheg-0.26.so -lib/libmythfreemheg-0.26.so.0 -lib/libmythfreemheg-0.26.so.0.26 -lib/libmythfreemheg-0.26.so.0.26.0 -lib/libmythmetadata-0.26.so -lib/libmythmetadata-0.26.so.0 -lib/libmythmetadata-0.26.so.0.26 -lib/libmythmetadata-0.26.so.0.26.0 +lib/libmythavutil.so.52 +lib/libmythavutil.so.52.18.100 +lib/libmythbase-0.27.so +lib/libmythbase-0.27.so.0 +lib/libmythbase-0.27.so.0.27 +lib/libmythbase-0.27.so.0.27.0 +lib/libmythfreemheg-0.27.so +lib/libmythfreemheg-0.27.so.0 +lib/libmythfreemheg-0.27.so.0.27 +lib/libmythfreemheg-0.27.so.0.27.0 +lib/libmythmetadata-0.27.so +lib/libmythmetadata-0.27.so.0 +lib/libmythmetadata-0.27.so.0.27 +lib/libmythmetadata-0.27.so.0.27.0 lib/libmythnzmqt.so lib/libmythnzmqt.so.0 -lib/libmythnzmqt.so.0.26 -lib/libmythnzmqt.so.0.26.0 +lib/libmythnzmqt.so.0.27 +lib/libmythnzmqt.so.0.27.0 lib/libmythpostproc.so lib/libmythpostproc.so.52 -lib/libmythpostproc.so.52.0.100 -lib/libmythprotoserver-0.26.so -lib/libmythprotoserver-0.26.so.0 -lib/libmythprotoserver-0.26.so.0.26 -lib/libmythprotoserver-0.26.so.0.26.0 +lib/libmythpostproc.so.52.2.100 +lib/libmythprotoserver-0.27.so +lib/libmythprotoserver-0.27.so.0 +lib/libmythprotoserver-0.27.so.0.27 +lib/libmythprotoserver-0.27.so.0.27.0 lib/libmythqjson.so lib/libmythqjson.so.0 lib/libmythqjson.so.0.7 lib/libmythqjson.so.0.7.1 -lib/libmythservicecontracts-0.26.so -lib/libmythservicecontracts-0.26.so.0 -lib/libmythservicecontracts-0.26.so.0.26 -lib/libmythservicecontracts-0.26.so.0.26.0 +lib/libmythservicecontracts-0.27.so +lib/libmythservicecontracts-0.27.so.0 +lib/libmythservicecontracts-0.27.so.0.27 +lib/libmythservicecontracts-0.27.so.0.27.0 lib/libmythswresample.so lib/libmythswresample.so.0 -lib/libmythswresample.so.0.15.100 +lib/libmythswresample.so.0.17.102 lib/libmythswscale.so lib/libmythswscale.so.2 -lib/libmythswscale.so.2.1.100 -lib/libmythtv-0.26.so -lib/libmythtv-0.26.so.0 -lib/libmythtv-0.26.so.0.26 -lib/libmythtv-0.26.so.0.26.0 -lib/libmythui-0.26.so -lib/libmythui-0.26.so.0 -lib/libmythui-0.26.so.0.26 -lib/libmythui-0.26.so.0.26.0 -lib/libmythupnp-0.26.so -lib/libmythupnp-0.26.so.0 -lib/libmythupnp-0.26.so.0.26 -lib/libmythupnp-0.26.so.0.26.0 +lib/libmythswscale.so.2.2.100 +lib/libmythtv-0.27.so +lib/libmythtv-0.27.so.0 +lib/libmythtv-0.27.so.0.27 +lib/libmythtv-0.27.so.0.27.0 +lib/libmythui-0.27.so +lib/libmythui-0.27.so.0 +lib/libmythui-0.27.so.0.27 +lib/libmythui-0.27.so.0.27.0 +lib/libmythupnp-0.27.so +lib/libmythupnp-0.27.so.0 +lib/libmythupnp-0.27.so.0.27 +lib/libmythupnp-0.27.so.0.27.0 lib/libmythzmq.a lib/libmythzmq.la lib/libmythzmq.so @@ -753,6 +789,7 @@ lib/pkgconfig/libmythzmq.pc %%DATADIR%%/i18n/mythfrontend_zh_hk.qm %%DATADIR%%/locales/da_dk.xml %%DATADIR%%/locales/de_de.xml +%%DATADIR%%/locales/el_gr.xml %%DATADIR%%/locales/en_ca.xml %%DATADIR%%/locales/en_gb.xml %%DATADIR%%/locales/en_us.xml @@ -781,6 +818,7 @@ lib/pkgconfig/libmythzmq.pc %%DATADIR%%/themes/MythCenter-wide/README %%DATADIR%%/themes/MythCenter-wide/appear-ui.xml %%DATADIR%%/themes/MythCenter-wide/base.xml +%%DATADIR%%/themes/MythCenter-wide/browser-ui.xml %%DATADIR%%/themes/MythCenter-wide/config-ui.xml %%DATADIR%%/themes/MythCenter-wide/controls-ui.xml %%DATADIR%%/themes/MythCenter-wide/htmls/progdetails_page1.html @@ -792,6 +830,7 @@ lib/pkgconfig/libmythzmq.pc %%DATADIR%%/themes/MythCenter-wide/mytharchive-ui.xml %%DATADIR%%/themes/MythCenter-wide/mythburn-ui.xml %%DATADIR%%/themes/MythCenter-wide/mythnative-ui.xml +%%DATADIR%%/themes/MythCenter-wide/notification-ui.xml %%DATADIR%%/themes/MythCenter-wide/osd.xml %%DATADIR%%/themes/MythCenter-wide/osd/bd.png %%DATADIR%%/themes/MythCenter-wide/osd/dvd.png @@ -833,10 +872,19 @@ lib/pkgconfig/libmythzmq.pc %%DATADIR%%/themes/MythCenter-wide/title/title_weather.png %%DATADIR%%/themes/MythCenter-wide/ui/background.png %%DATADIR%%/themes/MythCenter-wide/ui/button_on.png +%%DATADIR%%/themes/MythCenter-wide/ui/cursor.png %%DATADIR%%/themes/MythCenter-wide/ui/down.png +%%DATADIR%%/themes/MythCenter-wide/ui/down_arrow-reg.png +%%DATADIR%%/themes/MythCenter-wide/ui/down_arrow-sel.png %%DATADIR%%/themes/MythCenter-wide/ui/horizon.png +%%DATADIR%%/themes/MythCenter-wide/ui/left_arrow-reg.png +%%DATADIR%%/themes/MythCenter-wide/ui/left_arrow-sel.png %%DATADIR%%/themes/MythCenter-wide/ui/mythtv_logo.png +%%DATADIR%%/themes/MythCenter-wide/ui/right_arrow-reg.png +%%DATADIR%%/themes/MythCenter-wide/ui/right_arrow-sel.png %%DATADIR%%/themes/MythCenter-wide/ui/up.png +%%DATADIR%%/themes/MythCenter-wide/ui/up_arrow-reg.png +%%DATADIR%%/themes/MythCenter-wide/ui/up_arrow-sel.png %%DATADIR%%/themes/MythCenter-wide/video-ui.xml %%DATADIR%%/themes/MythCenter-wide/watermark/alarmclock.png %%DATADIR%%/themes/MythCenter-wide/watermark/appearance.png @@ -886,15 +934,31 @@ lib/pkgconfig/libmythzmq.pc %%DATADIR%%/themes/MythCenter-wide/zoneminder-ui.xml %%DATADIR%%/themes/MythCenter/README %%DATADIR%%/themes/MythCenter/base.xml +%%DATADIR%%/themes/MythCenter/browser-ui.xml %%DATADIR%%/themes/MythCenter/cr-lines.png %%DATADIR%%/themes/MythCenter/cr-selectbar.png %%DATADIR%%/themes/MythCenter/htmls/progdetails_page1.html %%DATADIR%%/themes/MythCenter/htmls/progdetails_page2.html %%DATADIR%%/themes/MythCenter/menu-ui.xml +%%DATADIR%%/themes/MythCenter/notification-ui.xml %%DATADIR%%/themes/MythCenter/osd.xml +%%DATADIR%%/themes/MythCenter/osd/bd.png +%%DATADIR%%/themes/MythCenter/osd/dvd.png %%DATADIR%%/themes/MythCenter/osd/fill_green.png +%%DATADIR%%/themes/MythCenter/osd/info.png +%%DATADIR%%/themes/MythCenter/osd/input.png +%%DATADIR%%/themes/MythCenter/osd/message.png %%DATADIR%%/themes/MythCenter/osd/osd-mid.png +%%DATADIR%%/themes/MythCenter/osd/prog_bot.png +%%DATADIR%%/themes/MythCenter/osd/prog_top.png +%%DATADIR%%/themes/MythCenter/osd/progressbar_bg.png +%%DATADIR%%/themes/MythCenter/osd/progressbar_cut.png +%%DATADIR%%/themes/MythCenter/osd/progressbar_fill.png +%%DATADIR%%/themes/MythCenter/osd/recording.png +%%DATADIR%%/themes/MythCenter/osd/sd.png %%DATADIR%%/themes/MythCenter/osd/slider_frame.png +%%DATADIR%%/themes/MythCenter/osd/tv.png +%%DATADIR%%/themes/MythCenter/osd/video.png %%DATADIR%%/themes/MythCenter/preview.png %%DATADIR%%/themes/MythCenter/qtlook.txt %%DATADIR%%/themes/MythCenter/recordings-ui.xml @@ -921,8 +985,16 @@ lib/pkgconfig/libmythzmq.pc %%DATADIR%%/themes/MythCenter/ui/button_off.png %%DATADIR%%/themes/MythCenter/ui/button_on.png %%DATADIR%%/themes/MythCenter/ui/down.png +%%DATADIR%%/themes/MythCenter/ui/down_arrow-reg.png +%%DATADIR%%/themes/MythCenter/ui/down_arrow-sel.png +%%DATADIR%%/themes/MythCenter/ui/left_arrow-reg.png +%%DATADIR%%/themes/MythCenter/ui/left_arrow-sel.png %%DATADIR%%/themes/MythCenter/ui/mythtv_logo.png +%%DATADIR%%/themes/MythCenter/ui/right_arrow-reg.png +%%DATADIR%%/themes/MythCenter/ui/right_arrow-sel.png %%DATADIR%%/themes/MythCenter/ui/up.png +%%DATADIR%%/themes/MythCenter/ui/up_arrow-reg.png +%%DATADIR%%/themes/MythCenter/ui/up_arrow-sel.png %%DATADIR%%/themes/MythCenter/video-ui.xml %%DATADIR%%/themes/MythCenter/watermark/alarmclock.png %%DATADIR%%/themes/MythCenter/watermark/appearance.png @@ -1319,6 +1391,7 @@ lib/pkgconfig/libmythzmq.pc %%DATADIR%%/themes/default/button_selected_background.png %%DATADIR%%/themes/default/categories.xml %%DATADIR%%/themes/default/cc.png +%%DATADIR%%/themes/default/check.png %%DATADIR%%/themes/default/checkbox_background_off.png %%DATADIR%%/themes/default/checkbox_background_selected.png %%DATADIR%%/themes/default/checkbox_fullcheck.png @@ -1345,6 +1418,7 @@ lib/pkgconfig/libmythzmq.pc %%DATADIR%%/themes/default/dummy720x480p29.97.ts %%DATADIR%%/themes/default/dummy720x576p25.00.ts %%DATADIR%%/themes/default/dummy768x576p50.00.ts +%%DATADIR%%/themes/default/error.png %%DATADIR%%/themes/default/filler.png %%DATADIR%%/themes/default/galleryfolder.png %%DATADIR%%/themes/default/gg-arrow-down.png @@ -1696,6 +1770,10 @@ lib/pkgconfig/libmythzmq.pc %%DATADIR%%/themes/default/locale/zw.png %%DATADIR%%/themes/default/md_progress_background.png %%DATADIR%%/themes/default/md_rip_banner.png +%%DATADIR%%/themes/default/menu_cutlist.xml +%%DATADIR%%/themes/default/menu_cutlist_compact.xml +%%DATADIR%%/themes/default/menu_playback.xml +%%DATADIR%%/themes/default/menu_playback_compact.xml %%DATADIR%%/themes/default/mono.png %%DATADIR%%/themes/default/mv_browse_background.png %%DATADIR%%/themes/default/mv_browse_selector.png @@ -1710,6 +1788,9 @@ lib/pkgconfig/libmythzmq.pc %%DATADIR%%/themes/default/mythdialogbox-background.png %%DATADIR%%/themes/default/mythfilebrowser-background.png %%DATADIR%%/themes/default/mythprogressdialog-background.png +%%DATADIR%%/themes/default/noartwork.png +%%DATADIR%%/themes/default/noartwork512.png +%%DATADIR%%/themes/default/notification-ui.xml %%DATADIR%%/themes/default/osd.xml %%DATADIR%%/themes/default/osd_subtitle.xml %%DATADIR%%/themes/default/pd-background.png @@ -1788,6 +1869,7 @@ lib/pkgconfig/libmythzmq.pc %%DATADIR%%/themes/default/very_wide_button_pushed_background.png %%DATADIR%%/themes/default/very_wide_button_selected_background.png %%DATADIR%%/themes/default/video-ui.xml +%%DATADIR%%/themes/default/warning.png %%DATADIR%%/themes/default/watched.png %%DATADIR%%/themes/default/welcome-ui.xml %%DATADIR%%/themes/default/wide.png diff --git a/multimedia/mythtv/Makefile b/multimedia/mythtv/Makefile index 9f76734ade8c..c8b4ea0dac8b 100644 --- a/multimedia/mythtv/Makefile +++ b/multimedia/mythtv/Makefile @@ -2,19 +2,16 @@ # $FreeBSD$ PORTNAME= mythtv -PORTVERSION= 0.26.1 +PORTVERSION= 0.27 CATEGORIES= multimedia -MASTER_SITES= http://ftp.osuosl.org/pub/mythtv/ \ - http://ftp.osuosl.org/pub/mythtv/old_releases/ \ - http://ftp.oregonstate.edu/pub/mythtv/ \ - http://ftp.oregonstate.edu/pub/mythtv/old_releases/ MAINTAINER= decke@FreeBSD.org COMMENT= MythTV is a homebrew PVR project -LIB_DEPENDS= mp3lame.0:${PORTSDIR}/audio/lame \ - freetype.9:${PORTSDIR}/print/freetype2 \ - tag.1:${PORTSDIR}/audio/taglib +LIB_DEPENDS= libmp3lame.so:${PORTSDIR}/audio/lame \ + libfreetype.so:${PORTSDIR}/print/freetype2 \ + libtag.so:${PORTSDIR}/audio/taglib \ + libxml2.so:${PORTSDIR}/textproc/libxml2 BUILD_DEPENDS= v4l_compat>=1.0.20100321:${PORTSDIR}/multimedia/v4l_compat \ yasm:${PORTSDIR}/devel/yasm RUN_DEPENDS= tv_check:${PORTSDIR}/textproc/p5-xmltv \ @@ -22,17 +19,24 @@ RUN_DEPENDS= tv_check:${PORTSDIR}/textproc/p5-xmltv \ CONFLICTS= mythtv-frontend-[0-9]* +USE_GITHUB= yes +GH_ACCOUNT= MythTV +GH_TAGNAME= v${PORTVERSION} + +WRKSRC= ${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-e9545c0/${GH_PROJECT} + +USE_GCC= any ONLY_FOR_ARCHS= i386 amd64 USES= gmake pkgconfig perl5 -USE_BZIP2= yes USE_QT4= gui sql network script linguist_build l10n sql-mysql_run \ moc_build qmake_build rcc_build uic_build imageformats QT_NONSTANDARD= yes -USE_MYSQL= 51 +USE_MYSQL= yes HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/lib/mythtv/filters REINPLACE_ARGS= -i "" USE_RC_SUBR= mythbackend +DESTDIRNAME= INSTALL_ROOT USERS= mythtv GROUPS= mythtv @@ -45,8 +49,8 @@ CONFIGURE_ENV+= QMAKESPEC="${QMAKESPEC}" MOC="${MOC}" \ QTDIR="${QT_PREFIX}" LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ARGS= --prefix="${PREFIX}" --dvb-path="${LOCALBASE}/include" \ - --enable-v4l2 --enable-ivtv --enable-xv \ +CONFIGURE_ARGS= --prefix="${PREFIX}" --cc="${CC}" --cxx="${CXX}" --dvb-path="${LOCALBASE}/include" \ + --libxml2-path="${LOCALBASE}/include/libxml2" --enable-v4l2 --enable-ivtv --enable-xv \ --disable-audio-alsa --disable-indev=alsa --disable-outdev=alsa QMAKESPEC?= ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ @@ -55,7 +59,14 @@ OPTIONS_DEFINE= BINDINGS LIRC MYSQL OPENGL VDPAU OPTIONS_DEFAULT= BINDINGS OPENGL BINDINGS_DESC= Perl and Python bindings -NO_STAGE= yes +LIRC_LIB_DEPENDS= liblirc_client.so:${PORTSDIR}/comms/lirc +MYSQL_RUN_DEPENDS= mysqld_safe:${PORTSDIR}/databases/mysql${MYSQL_VER}-server + +VDPAU_LIB_DEPENDS= libvdpau.so:${PORTSDIR}/multimedia/libvdpau +VDPAU_CONFIGURE_ENABLE= vdpau + +OPENGL_CONFIGURE_ENABLE= opengl-video + .include <bsd.port.options.mk> SUB_FILES= pkg-message @@ -71,7 +82,7 @@ MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin USE_PYTHON= yes INSTALLS_EGGINFO=yes PYDISTUTILS_PKGNAME=MythTV -PYDISTUTILS_PKGVERSION=0.26.0 +PYDISTUTILS_PKGVERSION=0.27._1 BUILD_DEPENDS+= py*-lxml>=0:${PORTSDIR}/devel/py-lxml \ ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb \ @@ -79,40 +90,26 @@ BUILD_DEPENDS+= py*-lxml>=0:${PORTSDIR}/devel/py-lxml \ p5-HTTP-Request-Params>=0:${PORTSDIR}/www/p5-HTTP-Request-Params \ p5-LWP-UserAgent-Determined>=0:${PORTSDIR}/www/p5-LWP-UserAgent-Determined \ p5-Net-UPnP>=0:${PORTSDIR}/multimedia/p5-Net-UPnP \ - p5-IO-Socket-INET6>=2.51:${PORTSDIR}/net/p5-IO-Socket-INET6 + p5-IO-Socket-INET6>=2.51:${PORTSDIR}/net/p5-IO-Socket-INET6 \ + p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \ + p5-DBD-mysql>0:${PORTSDIR}/databases/p5-DBD-mysql RUN_DEPENDS+= py*-lxml>=0:${PORTSDIR}/devel/py-lxml \ ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb \ ${PYTHON_PKGNAMEPREFIX}urlgrabber>=3.1.0_1:${PORTSDIR}/www/py-urlgrabber \ p5-HTTP-Request-Params>=0:${PORTSDIR}/www/p5-HTTP-Request-Params \ p5-LWP-UserAgent-Determined>=0:${PORTSDIR}/www/p5-LWP-UserAgent-Determined \ p5-Net-UPnP>=0:${PORTSDIR}/multimedia/p5-Net-UPnP \ - p5-IO-Socket-INET6>=2.51:${PORTSDIR}/net/p5-IO-Socket-INET6 + p5-IO-Socket-INET6>=2.51:${PORTSDIR}/net/p5-IO-Socket-INET6 \ + p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \ + p5-DBD-mysql>0:${PORTSDIR}/databases/p5-DBD-mysql PLIST_SUB+= BINDINGS="" .else CONFIGURE_ARGS+=--without-bindings=perl,python PLIST_SUB+= BINDINGS="@comment " .endif -.if ${PORT_OPTIONS:MLIRC} -LIB_DEPENDS+= lirc_client.2:${PORTSDIR}/comms/lirc -.endif - -.if ${PORT_OPTIONS:MMYSQL} -RUN_DEPENDS+= mysqld_safe:${PORTSDIR}/databases/mysql${MYSQL_VER}-server -.endif - .if ${PORT_OPTIONS:MOPENGL} USE_QT4+= opengl -CONFIGURE_ARGS+= --enable-opengl-video -.else -CONFIGURE_ARGS+= --disable-opengl-video -.endif - -.if ${PORT_OPTIONS:MVDPAU} -LIB_DEPENDS+= vdpau.1:${PORTSDIR}/multimedia/libvdpau -CONFIGURE_ARGS+= --enable-vdpau -.else -CONFIGURE_ARGS+= --disable-vdpau .endif post-patch: @@ -126,8 +123,7 @@ post-patch: ${WRKSRC}/programs/mythcommflag/mythcommflag-analyze post-install: - @${INSTALL} -d ${PREFIX}/share/mythtv/database - @${CP} ${WRKSRC}/database/mc.sql ${PREFIX}/share/mythtv/database - @${CAT} ${PKGMESSAGE} + @${INSTALL} -d ${STAGEDIR}${PREFIX}/share/mythtv/database + @${CP} ${WRKSRC}/database/mc.sql ${STAGEDIR}${PREFIX}/share/mythtv/database .include <bsd.port.mk> diff --git a/multimedia/mythtv/distinfo b/multimedia/mythtv/distinfo index c7a2ea35033e..66c307cfbe08 100644 --- a/multimedia/mythtv/distinfo +++ b/multimedia/mythtv/distinfo @@ -1,2 +1,2 @@ -SHA256 (mythtv-0.26.1.tar.bz2) = 4ede371637f74d7442ddcec8e6968775d1c11377dd8907deac720e957707b3fa -SIZE (mythtv-0.26.1.tar.bz2) = 40871547 +SHA256 (mythtv-0.27.tar.gz) = e8d77c48f487bd057b2f887c27416d502b79c78c4e1cfb05d87ec70d690f8d0d +SIZE (mythtv-0.27.tar.gz) = 85915149 diff --git a/multimedia/mythtv/files/patch-configure b/multimedia/mythtv/files/patch-configure index ec18184b8f97..bf2acae42795 100644 --- a/multimedia/mythtv/files/patch-configure +++ b/multimedia/mythtv/files/patch-configure @@ -1,31 +1,39 @@ ---- configure.orig 2012-10-02 12:30:24.000000000 +0200 -+++ configure 2012-10-03 19:27:16.773415414 +0200 -@@ -731,21 +731,21 @@ +--- configure.orig 2013-09-18 20:06:08.000000000 +0000 ++++ configure 2013-10-18 11:11:10.000000000 +0000 +@@ -846,28 +846,28 @@ log check_cc "$@" cat > $TMPC log_file $TMPC -- check_cmd $cc $CPPFLAGS $CFLAGS "$@" -c -o $TMPO $TMPC -+ check_cmd $cc $CPPFLAGS $CFLAGS -I${prefix}/include "$@" -c -o $TMPO $TMPC +- check_cmd $cc $CPPFLAGS $CFLAGS "$@" $CC_C $(cc_o $TMPO) $TMPC ++ check_cmd $cc $CPPFLAGS $CFLAGS -I${prefix}/include "$@" $CC_C $(cc_o $TMPO) $TMPC } check_cxx(){ log check_cxx "$@" cat > $TMPCPP log_file $TMPCPP -- check_cmd $cxx $CPPFLAGS $CXXFLAGS "$@" -c -o $TMPO $TMPCPP -+ check_cmd $cxx $CPPFLAGS $CXXFLAGS -I${prefix}/include "$@" -c -o $TMPO $TMPCPP +- check_cmd $cxx $CPPFLAGS $CXXFLAGS "$@" $CXX_C -o $TMPO $TMPCPP ++ check_cmd $cxx $CPPFLAGS $CXXFLAGS -I${prefix}/include "$@" $CXX_C -o $TMPO $TMPCPP + } + + check_ecxx(){ + log check_cxx "$@" + cat > $TMPCPP + log_file $TMPCPP +- check_cmd $cxx $CPPFLAGS $CXXFLAGS $ECXXFLAGS "$@" $CXX_C -o $TMPO $TMPCPP ++ check_cmd $cxx $CPPFLAGS $CXXFLAGS $ECXXFLAGS -I${prefix}/include "$@" $CXX_C -o $TMPO $TMPCPP } check_cpp(){ log check_cpp "$@" cat > $TMPC log_file $TMPC -- check_cmd $cc $CPPFLAGS $CFLAGS "$@" -E -o $TMPO $TMPC -+ check_cmd $cc $CPPFLAGS $CFLAGS -I${prefix}/include "$@" -E -o $TMPO $TMPC +- check_cmd $cc $CPPFLAGS $CFLAGS "$@" $(cc_e $TMPO) $TMPC ++ check_cmd $cc $CPPFLAGS $CFLAGS -I${prefix}/include "$@" $(cc_e $TMPO) $TMPC } - check_as(){ -@@ -2152,7 +2152,7 @@ + as_o(){ +@@ -2539,7 +2539,7 @@ # machine arch_default=$(uname -m) @@ -34,8 +42,8 @@ processor=`uname -p 2>/dev/null` processor_flags="" tune="generic" -@@ -3185,7 +3185,7 @@ - i686|pentiumpro|pentium[23]|pentium-m|athlon|athlon-tbird|athlon-4|athlon-[mx]p|athlon64*|k8*|opteron*|athlon-fx|core2|amdfam10|barcelona|atom) +@@ -3931,7 +3931,7 @@ + i686|pentiumpro|pentium[23]|pentium-m|athlon|athlon-tbird|athlon-4|athlon-[mx]p|athlon64*|k8*|opteron*|athlon-fx|core2|corei7*|amdfam10|barcelona|atom|bdver*) cpuflags="-march=$cpu" enable cmov - enable fast_cmov @@ -43,7 +51,7 @@ ;; # targets that do support conditional mov but on which it's slow pentium4|pentium4m|prescott|nocona) -@@ -3401,7 +3401,6 @@ +@@ -4102,7 +4102,6 @@ append CCONFIG "freebsd" # Workaround compile errors from missing u_int/uint def CPPFLAGS=`echo $CPPFLAGS | sed 's/-D_POSIX_C_SOURCE=200112//'` @@ -51,16 +59,15 @@ enable backend ;; bsd/os) -@@ -5427,6 +5426,8 @@ +@@ -6383,6 +6382,7 @@ QMAKE_LIBDIR_QT-=${sysroot}${libdir} QMAKE_LIBDIR-=${sysroot}${libdir} LATE_LIBS+=-L${sysroot}${libdir} -+CONFIG_INCLUDEPATH= +FREETYPE_CFLAGS-= -I/usr/local/include EOF #echo "endif # FFMPEG_CONFIG_MAK" >> $TMPMAK -@@ -5477,7 +5478,7 @@ +@@ -6435,7 +6435,7 @@ BINDIR=\$(INSTALL_ROOT)$bindir DATADIR=\$(INSTALL_ROOT)$datadir MANDIR=\$(INSTALL_ROOT)$mandir diff --git a/multimedia/mythtv/files/patch-external__FFmpeg__libavcodec__x86__ac3dsp_init.c b/multimedia/mythtv/files/patch-external__FFmpeg__libavcodec__x86__ac3dsp_init.c new file mode 100644 index 000000000000..7c8f5758f0c7 --- /dev/null +++ b/multimedia/mythtv/files/patch-external__FFmpeg__libavcodec__x86__ac3dsp_init.c @@ -0,0 +1,11 @@ +--- external/FFmpeg/libavcodec/x86/ac3dsp_init.c.orig 2013-09-18 20:06:08.000000000 +0000 ++++ external/FFmpeg/libavcodec/x86/ac3dsp_init.c 2013-10-18 11:58:01.000000000 +0000 +@@ -51,7 +51,7 @@ + extern void ff_ac3_extract_exponents_sse2 (uint8_t *exp, int32_t *coef, int nb_coefs); + extern void ff_ac3_extract_exponents_ssse3(uint8_t *exp, int32_t *coef, int nb_coefs); + +-#if ARCH_X86_32 && defined(__INTEL_COMPILER) ++#if ARCH_X86_32 && (defined(__INTEL_COMPILER) || defined(__clang__)) + # undef HAVE_7REGS + # define HAVE_7REGS 0 + #endif diff --git a/multimedia/mythtv/files/patch-libs__libmythbase__logging.cpp b/multimedia/mythtv/files/patch-libs__libmythbase__logging.cpp new file mode 100644 index 000000000000..776697497968 --- /dev/null +++ b/multimedia/mythtv/files/patch-libs__libmythbase__logging.cpp @@ -0,0 +1,20 @@ +--- libs/libmythbase/logging.cpp.orig 2013-09-18 20:06:08.000000000 +0000 ++++ libs/libmythbase/logging.cpp 2013-10-18 14:57:43.000000000 +0000 +@@ -859,7 +859,7 @@ + #ifndef _WIN32 + if (logPropagateOpts.facility >= 0) + { +- CODE *syslogname; ++ const CODE *syslogname; + + for (syslogname = &facilitynames[0]; + (syslogname->c_name && +@@ -996,7 +996,7 @@ + "Windows does not support syslog, disabling" ); + return( -2 ); + #else +- CODE *name; ++ const CODE *name; + int i; + QByteArray ba = facility.toLocal8Bit(); + char *string = (char *)ba.constData(); diff --git a/multimedia/mythtv/files/patch-libs__libmythbase__mythmiscutil.h b/multimedia/mythtv/files/patch-libs__libmythbase__mythmiscutil.h new file mode 100644 index 000000000000..a55e0e21126e --- /dev/null +++ b/multimedia/mythtv/files/patch-libs__libmythbase__mythmiscutil.h @@ -0,0 +1,10 @@ +--- libs/libmythbase/mythmiscutil.h.orig 2013-09-18 20:06:08.000000000 +0000 ++++ libs/libmythbase/mythmiscutil.h 2013-10-18 12:23:08.000000000 +0000 +@@ -2,6 +2,7 @@ + #define MYTHMISCUTIL_H_ + + #include <stdint.h> ++#include <time.h> + + #include <algorithm> + using namespace std; diff --git a/multimedia/mythtv/files/patch-libs__libmythbase__mythsystemlegacy.h b/multimedia/mythtv/files/patch-libs__libmythbase__mythsystemlegacy.h new file mode 100644 index 000000000000..41b4031a6193 --- /dev/null +++ b/multimedia/mythtv/files/patch-libs__libmythbase__mythsystemlegacy.h @@ -0,0 +1,10 @@ +--- libs/libmythbase/mythsystemlegacy.h.orig 2013-09-18 20:06:08.000000000 +0000 ++++ libs/libmythbase/mythsystemlegacy.h 2013-10-18 11:37:16.000000000 +0000 +@@ -42,6 +42,7 @@ + + // C headers + #include <stdint.h> ++#include <time.h> + + #ifdef __cplusplus + diff --git a/multimedia/mythtv/files/patch-libs__libmythbase__mythtimer.cpp b/multimedia/mythtv/files/patch-libs__libmythbase__mythtimer.cpp new file mode 100644 index 000000000000..71d62ca60099 --- /dev/null +++ b/multimedia/mythtv/files/patch-libs__libmythbase__mythtimer.cpp @@ -0,0 +1,11 @@ +--- libs/libmythbase/mythtimer.cpp.orig 2013-09-18 20:06:08.000000000 +0000 ++++ libs/libmythbase/mythtimer.cpp 2013-10-22 11:03:36.000000000 +0000 +@@ -19,6 +19,8 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + ++#include <stdint.h> ++ + // MythTV includes + #include "mythtimer.h" + diff --git a/multimedia/mythtv/files/patch-libs__libmythbase__mythtimezone.cpp b/multimedia/mythtv/files/patch-libs__libmythbase__mythtimezone.cpp new file mode 100644 index 000000000000..14436c1aee6a --- /dev/null +++ b/multimedia/mythtv/files/patch-libs__libmythbase__mythtimezone.cpp @@ -0,0 +1,10 @@ +--- libs/libmythbase/mythtimezone.cpp.orig 2013-09-18 20:06:08.000000000 +0000 ++++ libs/libmythbase/mythtimezone.cpp 2013-10-18 16:01:39.000000000 +0000 +@@ -1,6 +1,7 @@ + #include "mythtimezone.h" + + #include <stdlib.h> // for malloc, getenv ++#include <time.h> + + #include <QDataStream> + #include <QTextStream> diff --git a/multimedia/mythtv/files/patch-libs__libmythtv__dvbdev__dvbci.cpp b/multimedia/mythtv/files/patch-libs__libmythtv__recorders__dvbdev__dvbci.cpp index 66bcd7368b9f..91a99ccb98b0 100644 --- a/multimedia/mythtv/files/patch-libs__libmythtv__dvbdev__dvbci.cpp +++ b/multimedia/mythtv/files/patch-libs__libmythtv__recorders__dvbdev__dvbci.cpp @@ -1,5 +1,5 @@ ---- libs/libmythtv/dvbdev/dvbci.cpp.orig 2010-03-07 04:11:52.000000000 +0100 -+++ libs/libmythtv/dvbdev/dvbci.cpp 2010-04-26 23:30:52.000000000 +0200 +--- libs/libmythtv/recorders/dvbdev/dvbci.cpp.orig 2010-03-07 04:11:52.000000000 +0100 ++++ libs/libmythtv/recorders/dvbdev/dvbci.cpp 2010-04-26 23:30:52.000000000 +0200 @@ -28,7 +28,9 @@ #include <errno.h> #include <ctype.h> diff --git a/multimedia/mythtv/files/patch-libs__libmythtv__dvbstreamhandler.cpp b/multimedia/mythtv/files/patch-libs__libmythtv__recorders__dvbstreamhandler.cpp index 58e4dd25d624..bf96bcb6ad9f 100644 --- a/multimedia/mythtv/files/patch-libs__libmythtv__dvbstreamhandler.cpp +++ b/multimedia/mythtv/files/patch-libs__libmythtv__recorders__dvbstreamhandler.cpp @@ -1,5 +1,5 @@ ---- libs/libmythtv/dvbstreamhandler.cpp.orig 2012-03-05 03:31:31.000000000 +0100 -+++ libs/libmythtv/dvbstreamhandler.cpp 2012-03-18 11:24:44.309770699 +0100 +--- libs/libmythtv/recorders/dvbstreamhandler.cpp.orig 2012-03-05 03:31:31.000000000 +0100 ++++ libs/libmythtv/recorders/dvbstreamhandler.cpp 2012-03-18 11:24:44.309770699 +0100 @@ -614,7 +614,7 @@ { struct dmx_pes_filter_params pesFilterParams; diff --git a/multimedia/mythtv/pkg-plist b/multimedia/mythtv/pkg-plist index f8ef2a8a8e2b..37b267389504 100644 --- a/multimedia/mythtv/pkg-plist +++ b/multimedia/mythtv/pkg-plist @@ -1,11 +1,13 @@ -@comment $FreeBSD$ bin/mythavtest bin/mythbackend bin/mythccextractor bin/mythcommflag bin/mythffmpeg +bin/mythffprobe +bin/mythffserver bin/mythfilldatabase bin/mythfrontend +bin/mythhdhomerun_config bin/mythjobqueue bin/mythlcdserver bin/mythlogserver @@ -14,6 +16,7 @@ bin/mythmetadatalookup bin/mythpreviewgen %%BINDINGS%%bin/mythpython bin/mythreplex +bin/mythscreenwizard bin/mythshutdown bin/mythtranscode bin/mythtv-setup @@ -29,18 +32,21 @@ include/mythtv/QJson/qjson_export.h include/mythtv/QJson/qobjecthelper.h include/mythtv/QJson/serializer.h include/mythtv/QJson/serializerrunnable.h +include/mythtv/audioconvert.h include/mythtv/audiooutput.h include/mythtv/audiooutputsettings.h +include/mythtv/audiooutpututil.h include/mythtv/audiosettings.h include/mythtv/autodeletedeque.h -include/mythtv/bswap.h include/mythtv/bluray/attributes.h +include/mythtv/bluray/bdid_parse.h include/mythtv/bluray/bdparse.h include/mythtv/bluray/bits.h include/mythtv/bluray/bluray.h include/mythtv/bluray/clpi_data.h include/mythtv/bluray/clpi_parse.h include/mythtv/bluray/dl.h +include/mythtv/bluray/extdata_parse.h include/mythtv/bluray/file.h include/mythtv/bluray/file_mythiowrapper.h include/mythtv/bluray/filesystem.h @@ -60,6 +66,7 @@ include/mythtv/bluray/sound_parse.h include/mythtv/bluray/strutl.h include/mythtv/bluray/uo_mask_table.h include/mythtv/bonjourregister.h +include/mythtv/bswap.h include/mythtv/compat.h include/mythtv/dbutil.h include/mythtv/dialogbox.h @@ -76,21 +83,21 @@ include/mythtv/exitcodes.h include/mythtv/ffmpeg-mmx.h include/mythtv/filesysteminfo.h include/mythtv/hardwareprofile.h -include/mythtv/httpcomms.h include/mythtv/iso3166.h include/mythtv/iso639.h include/mythtv/langsettings.h include/mythtv/lcddevice.h -include/mythtv/loggingserver.h include/mythtv/libavcodec/avcodec.h include/mythtv/libavcodec/avfft.h include/mythtv/libavcodec/dxva2.h +include/mythtv/libavcodec/old_codec_ids.h include/mythtv/libavcodec/vaapi.h include/mythtv/libavcodec/vda.h include/mythtv/libavcodec/vdpau.h include/mythtv/libavcodec/version.h include/mythtv/libavcodec/xvmc.h include/mythtv/libavdevice/avdevice.h +include/mythtv/libavdevice/version.h include/mythtv/libavfilter/asrc_abuffer.h include/mythtv/libavfilter/avcodec.h include/mythtv/libavfilter/avfilter.h @@ -98,7 +105,6 @@ include/mythtv/libavfilter/avfiltergraph.h include/mythtv/libavfilter/buffersink.h include/mythtv/libavfilter/buffersrc.h include/mythtv/libavfilter/version.h -include/mythtv/libavfilter/vsrc_buffer.h include/mythtv/libavformat/avformat.h include/mythtv/libavformat/avio.h include/mythtv/libavformat/version.h @@ -112,8 +118,10 @@ include/mythtv/libavutil/avconfig.h include/mythtv/libavutil/avstring.h include/mythtv/libavutil/avutil.h include/mythtv/libavutil/base64.h +include/mythtv/libavutil/blowfish.h include/mythtv/libavutil/bprint.h include/mythtv/libavutil/bswap.h +include/mythtv/libavutil/channel_layout.h include/mythtv/libavutil/common.h include/mythtv/libavutil/cpu.h include/mythtv/libavutil/crc.h @@ -122,9 +130,10 @@ include/mythtv/libavutil/error.h include/mythtv/libavutil/eval.h include/mythtv/libavutil/fifo.h include/mythtv/libavutil/file.h +include/mythtv/libavutil/hmac.h include/mythtv/libavutil/imgutils.h -include/mythtv/libavutil/intfloat_readwrite.h include/mythtv/libavutil/intfloat.h +include/mythtv/libavutil/intfloat_readwrite.h include/mythtv/libavutil/intreadwrite.h include/mythtv/libavutil/lfg.h include/mythtv/libavutil/log.h @@ -132,6 +141,7 @@ include/mythtv/libavutil/lzo.h include/mythtv/libavutil/mathematics.h include/mythtv/libavutil/md5.h include/mythtv/libavutil/mem.h +include/mythtv/libavutil/old_pix_fmts.h include/mythtv/libavutil/opt.h include/mythtv/libavutil/parseutils.h include/mythtv/libavutil/pixdesc.h @@ -140,10 +150,15 @@ include/mythtv/libavutil/random_seed.h include/mythtv/libavutil/rational.h include/mythtv/libavutil/samplefmt.h include/mythtv/libavutil/sha.h +include/mythtv/libavutil/time.h include/mythtv/libavutil/timecode.h include/mythtv/libavutil/timestamp.h +include/mythtv/libavutil/version.h +include/mythtv/libavutil/xtea.h +include/mythtv/libmyth/audioconvert.h include/mythtv/libmyth/audiooutput.h include/mythtv/libmyth/audiooutputsettings.h +include/mythtv/libmyth/audiooutpututil.h include/mythtv/libmyth/audiosettings.h include/mythtv/libmyth/dialogbox.h include/mythtv/libmyth/eldutils.h @@ -154,8 +169,6 @@ include/mythtv/libmyth/mythcontext.h include/mythtv/libmyth/mythdialogs.h include/mythtv/libmyth/mythexp.h include/mythtv/libmyth/mythmediamonitor.h -include/mythtv/libmyth/mythplugin.h -include/mythtv/libmyth/mythpluginapi.h include/mythtv/libmyth/mythrssmanager.h include/mythtv/libmyth/mythterminal.h include/mythtv/libmyth/mythwidgets.h @@ -187,13 +200,11 @@ include/mythtv/libmythbase/exitcodes.h include/mythtv/libmythbase/ffmpeg-mmx.h include/mythtv/libmythbase/filesysteminfo.h include/mythtv/libmythbase/hardwareprofile.h -include/mythtv/libmythbase/httpcomms.h include/mythtv/libmythbase/iso3166.h include/mythtv/libmythbase/iso639.h include/mythtv/libmythbase/lcddevice.h include/mythtv/libmythbase/loggingserver.h include/mythtv/libmythbase/mcodecs.h -include/mythtv/libmythbase/msocketdevice.h include/mythtv/libmythbase/mthread.h include/mythtv/libmythbase/mthreadpool.h include/mythtv/libmythbase/mythbaseexp.h @@ -211,24 +222,31 @@ include/mythtv/libmythbase/mythdeque.h include/mythtv/libmythbase/mythdirs.h include/mythtv/libmythbase/mythdownloadmanager.h include/mythtv/libmythbase/mythevent.h -include/mythtv/libmythbase/mythhttppool.h include/mythtv/libmythbase/mythlocale.h include/mythtv/libmythbase/mythlogging.h include/mythtv/libmythbase/mythmedia.h include/mythtv/libmythbase/mythmiscutil.h include/mythtv/libmythbase/mythobservable.h -include/mythtv/libmythbase/signalhandling.h +include/mythtv/libmythbase/mythplugin.h +include/mythtv/libmythbase/mythpluginapi.h +include/mythtv/libmythbase/mythqtcompat.h include/mythtv/libmythbase/mythsocket.h include/mythtv/libmythbase/mythsocket_cb.h include/mythtv/libmythbase/mythstorage.h include/mythtv/libmythbase/mythsystem.h +include/mythtv/libmythbase/mythsystemlegacy.h include/mythtv/libmythbase/mythtimer.h include/mythtv/libmythbase/mythtranslation.h +include/mythtv/libmythbase/mythtypes.h include/mythtv/libmythbase/mythversion.h include/mythtv/libmythbase/plist.h include/mythtv/libmythbase/referencecounter.h +include/mythtv/libmythbase/referencecounterlist.h +include/mythtv/libmythbase/remotefile.h include/mythtv/libmythbase/serverpool.h +include/mythtv/libmythbase/signalhandling.h include/mythtv/libmythbase/storagegroup.h +include/mythtv/libmythbase/threadedfilewriter.h include/mythtv/libmythbase/verbosedefs.h include/mythtv/libmythbase/version.h include/mythtv/libmythservicecontracts/datacontracthelper.h @@ -255,6 +273,8 @@ include/mythtv/libmythservicecontracts/datacontracts/recRuleList.h include/mythtv/libmythservicecontracts/datacontracts/recording.h include/mythtv/libmythservicecontracts/datacontracts/settingList.h include/mythtv/libmythservicecontracts/datacontracts/timeZoneInfo.h +include/mythtv/libmythservicecontracts/datacontracts/titleInfo.h +include/mythtv/libmythservicecontracts/datacontracts/titleInfoList.h include/mythtv/libmythservicecontracts/datacontracts/versionInfo.h include/mythtv/libmythservicecontracts/datacontracts/videoLookupInfo.h include/mythtv/libmythservicecontracts/datacontracts/videoLookupInfoList.h @@ -281,6 +301,8 @@ include/mythtv/libmythui/mythgenerictree.h include/mythtv/libmythui/mythgesture.h include/mythtv/libmythui/mythimage.h include/mythtv/libmythui/mythmainwindow.h +include/mythtv/libmythui/mythnotification.h +include/mythtv/libmythui/mythnotificationcenter.h include/mythtv/libmythui/mythpainter.h include/mythtv/libmythui/mythpainter_ogl.h include/mythtv/libmythui/mythpainter_qt.h @@ -297,6 +319,7 @@ include/mythtv/libmythui/mythuibuttonlist.h include/mythtv/libmythui/mythuibuttontree.h include/mythtv/libmythui/mythuicheckbox.h include/mythtv/libmythui/mythuiclock.h +include/mythtv/libmythui/mythuicomposite.h include/mythtv/libmythui/mythuieditbar.h include/mythtv/libmythui/mythuiexp.h include/mythtv/libmythui/mythuifilebrowser.h @@ -322,8 +345,12 @@ include/mythtv/libmythui/themeinfo.h include/mythtv/libmythui/x11colors.h include/mythtv/libmythui/xmlparsebase.h include/mythtv/libpostproc/postprocess.h +include/mythtv/libpostproc/version.h include/mythtv/libswresample/swresample.h +include/mythtv/libswresample/version.h include/mythtv/libswscale/swscale.h +include/mythtv/libswscale/version.h +include/mythtv/loggingserver.h include/mythtv/mcodecs.h include/mythtv/metadata/bluraymetadata.h include/mythtv/metadata/cleanup.h @@ -335,6 +362,16 @@ include/mythtv/metadata/metadatadownload.h include/mythtv/metadata/metadatafactory.h include/mythtv/metadata/metadataimagedownload.h include/mythtv/metadata/metadataimagehelper.h +include/mythtv/metadata/metaio.h +include/mythtv/metadata/metaioavfcomment.h +include/mythtv/metadata/metaioflacvorbis.h +include/mythtv/metadata/metaioid3.h +include/mythtv/metadata/metaiomp4.h +include/mythtv/metadata/metaiooggvorbis.h +include/mythtv/metadata/metaiotaglib.h +include/mythtv/metadata/metaiowavpack.h +include/mythtv/metadata/musicmetadata.h +include/mythtv/metadata/musicutils.h include/mythtv/metadata/mythmetaexp.h include/mythtv/metadata/mythuiimageresults.h include/mythtv/metadata/mythuimetadataresults.h @@ -346,7 +383,6 @@ include/mythtv/metadata/videoscan.h include/mythtv/metadata/videoutils.h include/mythtv/metadataimagehelper.h include/mythtv/mpeg2dec/mpeg2.h -include/mythtv/msocketdevice.h include/mythtv/mthread.h include/mythtv/mthreadpool.h include/mythtv/mythbaseexp.h @@ -369,7 +405,6 @@ include/mythtv/mythdirs.h include/mythtv/mythdownloadmanager.h include/mythtv/mythevent.h include/mythtv/mythexp.h -include/mythtv/mythhttppool.h include/mythtv/mythlocale.h include/mythtv/mythlogging.h include/mythtv/mythmedia.h @@ -378,15 +413,18 @@ include/mythtv/mythmiscutil.h include/mythtv/mythobservable.h include/mythtv/mythplugin.h include/mythtv/mythpluginapi.h +include/mythtv/mythqtcompat.h include/mythtv/mythrssmanager.h include/mythtv/mythsocket.h include/mythtv/mythsocket_cb.h include/mythtv/mythstorage.h include/mythtv/mythsystem.h +include/mythtv/mythsystemlegacy.h include/mythtv/mythterminal.h include/mythtv/mythtimer.h include/mythtv/mythtranslation.h include/mythtv/mythtvexp.h +include/mythtv/mythtypes.h include/mythtv/mythversion.h include/mythtv/mythwidgets.h include/mythtv/mythwizard.h @@ -401,6 +439,7 @@ include/mythtv/programinfo.h include/mythtv/programtypes.h include/mythtv/recordingtypes.h include/mythtv/referencecounter.h +include/mythtv/referencecounterlist.h include/mythtv/remotefile.h include/mythtv/remoteutil.h include/mythtv/rssparse.h @@ -411,6 +450,7 @@ include/mythtv/settings.h include/mythtv/signalhandling.h include/mythtv/storagegroup.h include/mythtv/storagegroupeditor.h +include/mythtv/threadedfilewriter.h include/mythtv/uitypes.h include/mythtv/upnp/bufferedsocketdevice.h include/mythtv/upnp/configuration.h @@ -451,6 +491,12 @@ include/mythtv/xmlparse.h include/mythtv/zeromq/zmq.h include/mythtv/zeromq/zmq.hpp include/mythtv/zeromq/zmq_utils.h +%%BINDINGS%%%%SITE_PERL%%/MythTV.pm +%%BINDINGS%%%%SITE_PERL%%/IO/Socket/INET/MythTV.pm +%%BINDINGS%%%%SITE_PERL%%/MythTV/Program.pm +%%BINDINGS%%%%SITE_PERL%%/MythTV/Recording.pm +%%BINDINGS%%%%SITE_PERL%%/MythTV/Channel.pm +%%BINDINGS%%%%SITE_PERL%%/MythTV/StorageGroup.pm %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/__init__.py %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/__init__.pyc %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/_conn_mysqldb.py @@ -548,84 +594,78 @@ include/mythtv/zeromq/zmq_utils.h %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/wikiscripts/__init__.pyc %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/wikiscripts/wikiscripts.py %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/wikiscripts/wikiscripts.pyc -lib/libmyth-0.26.so -lib/libmyth-0.26.so.0 -lib/libmyth-0.26.so.0.26 -lib/libmyth-0.26.so.0.26.0 +lib/libmyth-0.27.so +lib/libmyth-0.27.so.0 +lib/libmyth-0.27.so.0.27 +lib/libmyth-0.27.so.0.27.0 lib/libmythavcodec.so lib/libmythavcodec.so.54 -lib/libmythavcodec.so.54.23.100 +lib/libmythavcodec.so.54.92.100 lib/libmythavdevice.so lib/libmythavdevice.so.54 -lib/libmythavdevice.so.54.0.100 +lib/libmythavdevice.so.54.3.103 lib/libmythavfilter.so -lib/libmythavfilter.so.2 -lib/libmythavfilter.so.2.77.100 +lib/libmythavfilter.so.3 +lib/libmythavfilter.so.3.42.103 lib/libmythavformat.so lib/libmythavformat.so.54 -lib/libmythavformat.so.54.6.101 +lib/libmythavformat.so.54.63.104 lib/libmythavutil.so -lib/libmythavutil.so.51 -lib/libmythavutil.so.51.56.100 -lib/libmythbase-0.26.so -lib/libmythbase-0.26.so.0 -lib/libmythbase-0.26.so.0.26 -lib/libmythbase-0.26.so.0.26.0 -lib/libmythbluray-0.26.a -lib/libmythdvdnav-0.26.a -lib/libmythfreemheg-0.26.so -lib/libmythfreemheg-0.26.so.0 -lib/libmythfreemheg-0.26.so.0.26 -lib/libmythfreemheg-0.26.so.0.26.0 -lib/libmythhdhomerun-0.26.so -lib/libmythhdhomerun-0.26.so.0 -lib/libmythhdhomerun-0.26.so.0.26 -lib/libmythhdhomerun-0.26.so.0.26.0 -lib/libmythlivemedia-0.26.so -lib/libmythlivemedia-0.26.so.0 -lib/libmythlivemedia-0.26.so.0.26 -lib/libmythlivemedia-0.26.so.0.26.0 -lib/libmythmetadata-0.26.so -lib/libmythmetadata-0.26.so.0 -lib/libmythmetadata-0.26.so.0.26 -lib/libmythmetadata-0.26.so.0.26.0 +lib/libmythavutil.so.52 +lib/libmythavutil.so.52.18.100 +lib/libmythbase-0.27.so +lib/libmythbase-0.27.so.0 +lib/libmythbase-0.27.so.0.27 +lib/libmythbase-0.27.so.0.27.0 +lib/libmythfreemheg-0.27.so +lib/libmythfreemheg-0.27.so.0 +lib/libmythfreemheg-0.27.so.0.27 +lib/libmythfreemheg-0.27.so.0.27.0 +lib/libmythhdhomerun-0.27.so +lib/libmythhdhomerun-0.27.so.0 +lib/libmythhdhomerun-0.27.so.0.27 +lib/libmythhdhomerun-0.27.so.0.27.0 +lib/libmythmetadata-0.27.so +lib/libmythmetadata-0.27.so.0 +lib/libmythmetadata-0.27.so.0.27 +lib/libmythmetadata-0.27.so.0.27.0 lib/libmythnzmqt.so lib/libmythnzmqt.so.0 -lib/libmythnzmqt.so.0.26 -lib/libmythnzmqt.so.0.26.0 +lib/libmythnzmqt.so.0.27 +lib/libmythnzmqt.so.0.27.0 lib/libmythpostproc.so lib/libmythpostproc.so.52 -lib/libmythpostproc.so.52.0.100 -lib/libmythprotoserver-0.26.so -lib/libmythprotoserver-0.26.so.0 -lib/libmythprotoserver-0.26.so.0.26 -lib/libmythprotoserver-0.26.so.0.26.0 +lib/libmythpostproc.so.52.2.100 +lib/libmythprotoserver-0.27.so +lib/libmythprotoserver-0.27.so.0 +lib/libmythprotoserver-0.27.so.0.27 +lib/libmythprotoserver-0.27.so.0.27.0 lib/libmythqjson.so lib/libmythqjson.so.0 lib/libmythqjson.so.0.7 lib/libmythqjson.so.0.7.1 -lib/libmythservicecontracts-0.26.so -lib/libmythservicecontracts-0.26.so.0 -lib/libmythservicecontracts-0.26.so.0.26 -lib/libmythservicecontracts-0.26.so.0.26.0 +lib/libmythservicecontracts-0.27.so +lib/libmythservicecontracts-0.27.so.0 +lib/libmythservicecontracts-0.27.so.0.27 +lib/libmythservicecontracts-0.27.so.0.27.0 lib/libmythswresample.so lib/libmythswresample.so.0 -lib/libmythswresample.so.0.15.100 +lib/libmythswresample.so.0.17.102 lib/libmythswscale.so lib/libmythswscale.so.2 -lib/libmythswscale.so.2.1.100 -lib/libmythtv-0.26.so -lib/libmythtv-0.26.so.0 -lib/libmythtv-0.26.so.0.26 -lib/libmythtv-0.26.so.0.26.0 -lib/libmythui-0.26.so -lib/libmythui-0.26.so.0 -lib/libmythui-0.26.so.0.26 -lib/libmythui-0.26.so.0.26.0 -lib/libmythupnp-0.26.so -lib/libmythupnp-0.26.so.0 -lib/libmythupnp-0.26.so.0.26 -lib/libmythupnp-0.26.so.0.26.0 +lib/libmythswscale.so.2.2.100 +lib/libmythtv-0.27.so +lib/libmythtv-0.27.so.0 +lib/libmythtv-0.27.so.0.27 +lib/libmythtv-0.27.so.0.27.0 +lib/libmythui-0.27.so +lib/libmythui-0.27.so.0 +lib/libmythui-0.27.so.0.27 +lib/libmythui-0.27.so.0.27.0 +lib/libmythupnp-0.27.so +lib/libmythupnp-0.27.so.0 +lib/libmythupnp-0.27.so.0.27 +lib/libmythupnp-0.27.so.0.27.0 lib/libmythzmq.a lib/libmythzmq.la lib/libmythzmq.so @@ -1059,6 +1099,7 @@ lib/pkgconfig/libmythzmq.pc %%DATADIR%%/internetcontent/youtube.py %%DATADIR%%/locales/da_dk.xml %%DATADIR%%/locales/de_de.xml +%%DATADIR%%/locales/el_gr.xml %%DATADIR%%/locales/en_ca.xml %%DATADIR%%/locales/en_gb.xml %%DATADIR%%/locales/en_us.xml @@ -1093,6 +1134,7 @@ lib/pkgconfig/libmythzmq.pc %%DATADIR%%/themes/MythCenter-wide/README %%DATADIR%%/themes/MythCenter-wide/appear-ui.xml %%DATADIR%%/themes/MythCenter-wide/base.xml +%%DATADIR%%/themes/MythCenter-wide/browser-ui.xml %%DATADIR%%/themes/MythCenter-wide/config-ui.xml %%DATADIR%%/themes/MythCenter-wide/controls-ui.xml %%DATADIR%%/themes/MythCenter-wide/htmls/progdetails_page1.html @@ -1104,6 +1146,7 @@ lib/pkgconfig/libmythzmq.pc %%DATADIR%%/themes/MythCenter-wide/mytharchive-ui.xml %%DATADIR%%/themes/MythCenter-wide/mythburn-ui.xml %%DATADIR%%/themes/MythCenter-wide/mythnative-ui.xml +%%DATADIR%%/themes/MythCenter-wide/notification-ui.xml %%DATADIR%%/themes/MythCenter-wide/osd.xml %%DATADIR%%/themes/MythCenter-wide/osd/bd.png %%DATADIR%%/themes/MythCenter-wide/osd/dvd.png @@ -1145,10 +1188,19 @@ lib/pkgconfig/libmythzmq.pc %%DATADIR%%/themes/MythCenter-wide/title/title_weather.png %%DATADIR%%/themes/MythCenter-wide/ui/background.png %%DATADIR%%/themes/MythCenter-wide/ui/button_on.png +%%DATADIR%%/themes/MythCenter-wide/ui/cursor.png %%DATADIR%%/themes/MythCenter-wide/ui/down.png +%%DATADIR%%/themes/MythCenter-wide/ui/down_arrow-reg.png +%%DATADIR%%/themes/MythCenter-wide/ui/down_arrow-sel.png %%DATADIR%%/themes/MythCenter-wide/ui/horizon.png +%%DATADIR%%/themes/MythCenter-wide/ui/left_arrow-reg.png +%%DATADIR%%/themes/MythCenter-wide/ui/left_arrow-sel.png %%DATADIR%%/themes/MythCenter-wide/ui/mythtv_logo.png +%%DATADIR%%/themes/MythCenter-wide/ui/right_arrow-reg.png +%%DATADIR%%/themes/MythCenter-wide/ui/right_arrow-sel.png %%DATADIR%%/themes/MythCenter-wide/ui/up.png +%%DATADIR%%/themes/MythCenter-wide/ui/up_arrow-reg.png +%%DATADIR%%/themes/MythCenter-wide/ui/up_arrow-sel.png %%DATADIR%%/themes/MythCenter-wide/video-ui.xml %%DATADIR%%/themes/MythCenter-wide/watermark/alarmclock.png %%DATADIR%%/themes/MythCenter-wide/watermark/appearance.png @@ -1198,15 +1250,31 @@ lib/pkgconfig/libmythzmq.pc %%DATADIR%%/themes/MythCenter-wide/zoneminder-ui.xml %%DATADIR%%/themes/MythCenter/README %%DATADIR%%/themes/MythCenter/base.xml +%%DATADIR%%/themes/MythCenter/browser-ui.xml %%DATADIR%%/themes/MythCenter/cr-lines.png %%DATADIR%%/themes/MythCenter/cr-selectbar.png %%DATADIR%%/themes/MythCenter/htmls/progdetails_page1.html %%DATADIR%%/themes/MythCenter/htmls/progdetails_page2.html %%DATADIR%%/themes/MythCenter/menu-ui.xml +%%DATADIR%%/themes/MythCenter/notification-ui.xml %%DATADIR%%/themes/MythCenter/osd.xml +%%DATADIR%%/themes/MythCenter/osd/bd.png +%%DATADIR%%/themes/MythCenter/osd/dvd.png %%DATADIR%%/themes/MythCenter/osd/fill_green.png +%%DATADIR%%/themes/MythCenter/osd/info.png +%%DATADIR%%/themes/MythCenter/osd/input.png +%%DATADIR%%/themes/MythCenter/osd/message.png %%DATADIR%%/themes/MythCenter/osd/osd-mid.png +%%DATADIR%%/themes/MythCenter/osd/prog_bot.png +%%DATADIR%%/themes/MythCenter/osd/prog_top.png +%%DATADIR%%/themes/MythCenter/osd/progressbar_bg.png +%%DATADIR%%/themes/MythCenter/osd/progressbar_cut.png +%%DATADIR%%/themes/MythCenter/osd/progressbar_fill.png +%%DATADIR%%/themes/MythCenter/osd/recording.png +%%DATADIR%%/themes/MythCenter/osd/sd.png %%DATADIR%%/themes/MythCenter/osd/slider_frame.png +%%DATADIR%%/themes/MythCenter/osd/tv.png +%%DATADIR%%/themes/MythCenter/osd/video.png %%DATADIR%%/themes/MythCenter/preview.png %%DATADIR%%/themes/MythCenter/qtlook.txt %%DATADIR%%/themes/MythCenter/recordings-ui.xml @@ -1233,8 +1301,16 @@ lib/pkgconfig/libmythzmq.pc %%DATADIR%%/themes/MythCenter/ui/button_off.png %%DATADIR%%/themes/MythCenter/ui/button_on.png %%DATADIR%%/themes/MythCenter/ui/down.png +%%DATADIR%%/themes/MythCenter/ui/down_arrow-reg.png +%%DATADIR%%/themes/MythCenter/ui/down_arrow-sel.png +%%DATADIR%%/themes/MythCenter/ui/left_arrow-reg.png +%%DATADIR%%/themes/MythCenter/ui/left_arrow-sel.png %%DATADIR%%/themes/MythCenter/ui/mythtv_logo.png +%%DATADIR%%/themes/MythCenter/ui/right_arrow-reg.png +%%DATADIR%%/themes/MythCenter/ui/right_arrow-sel.png %%DATADIR%%/themes/MythCenter/ui/up.png +%%DATADIR%%/themes/MythCenter/ui/up_arrow-reg.png +%%DATADIR%%/themes/MythCenter/ui/up_arrow-sel.png %%DATADIR%%/themes/MythCenter/video-ui.xml %%DATADIR%%/themes/MythCenter/watermark/alarmclock.png %%DATADIR%%/themes/MythCenter/watermark/appearance.png @@ -1291,6 +1367,7 @@ lib/pkgconfig/libmythzmq.pc %%DATADIR%%/themes/Terra/browser-ui.xml %%DATADIR%%/themes/Terra/config-ui.xml %%DATADIR%%/themes/Terra/config/selected_icon_mask.png +%%DATADIR%%/themes/Terra/controls-ui.xml %%DATADIR%%/themes/Terra/controls/button.png %%DATADIR%%/themes/Terra/controls/button_pushed.png %%DATADIR%%/themes/Terra/controls/checkbox_background.png @@ -1302,7 +1379,6 @@ lib/pkgconfig/libmythzmq.pc %%DATADIR%%/themes/Terra/controls/short_textedit_background_selected.png %%DATADIR%%/themes/Terra/controls/small_button.png %%DATADIR%%/themes/Terra/controls/small_button_pushed.png -%%DATADIR%%/themes/Terra/controls-ui.xml %%DATADIR%%/themes/Terra/gallery-ui.xml %%DATADIR%%/themes/Terra/game-ui.xml %%DATADIR%%/themes/Terra/guide/guide_arrow_left.png @@ -1631,6 +1707,7 @@ lib/pkgconfig/libmythzmq.pc %%DATADIR%%/themes/default/button_selected_background.png %%DATADIR%%/themes/default/categories.xml %%DATADIR%%/themes/default/cc.png +%%DATADIR%%/themes/default/check.png %%DATADIR%%/themes/default/checkbox_background_off.png %%DATADIR%%/themes/default/checkbox_background_selected.png %%DATADIR%%/themes/default/checkbox_fullcheck.png @@ -1657,6 +1734,7 @@ lib/pkgconfig/libmythzmq.pc %%DATADIR%%/themes/default/dummy720x480p29.97.ts %%DATADIR%%/themes/default/dummy720x576p25.00.ts %%DATADIR%%/themes/default/dummy768x576p50.00.ts +%%DATADIR%%/themes/default/error.png %%DATADIR%%/themes/default/filler.png %%DATADIR%%/themes/default/galleryfolder.png %%DATADIR%%/themes/default/gg-arrow-down.png @@ -2008,6 +2086,10 @@ lib/pkgconfig/libmythzmq.pc %%DATADIR%%/themes/default/locale/zw.png %%DATADIR%%/themes/default/md_progress_background.png %%DATADIR%%/themes/default/md_rip_banner.png +%%DATADIR%%/themes/default/menu_cutlist.xml +%%DATADIR%%/themes/default/menu_cutlist_compact.xml +%%DATADIR%%/themes/default/menu_playback.xml +%%DATADIR%%/themes/default/menu_playback_compact.xml %%DATADIR%%/themes/default/mono.png %%DATADIR%%/themes/default/mv_browse_background.png %%DATADIR%%/themes/default/mv_browse_selector.png @@ -2022,6 +2104,9 @@ lib/pkgconfig/libmythzmq.pc %%DATADIR%%/themes/default/mythdialogbox-background.png %%DATADIR%%/themes/default/mythfilebrowser-background.png %%DATADIR%%/themes/default/mythprogressdialog-background.png +%%DATADIR%%/themes/default/noartwork.png +%%DATADIR%%/themes/default/noartwork512.png +%%DATADIR%%/themes/default/notification-ui.xml %%DATADIR%%/themes/default/osd.xml %%DATADIR%%/themes/default/osd_subtitle.xml %%DATADIR%%/themes/default/pd-background.png @@ -2100,6 +2185,7 @@ lib/pkgconfig/libmythzmq.pc %%DATADIR%%/themes/default/very_wide_button_pushed_background.png %%DATADIR%%/themes/default/very_wide_button_selected_background.png %%DATADIR%%/themes/default/video-ui.xml +%%DATADIR%%/themes/default/warning.png %%DATADIR%%/themes/default/watched.png %%DATADIR%%/themes/default/welcome-ui.xml %%DATADIR%%/themes/default/wide.png @@ -2251,6 +2337,10 @@ lib/pkgconfig/libmythzmq.pc %%BINDINGS%%@dirrm %%PYTHON_SITELIBDIR%%/MythTV/tmdb/XSLT %%BINDINGS%%@dirrm %%PYTHON_SITELIBDIR%%/MythTV/tmdb %%BINDINGS%%@dirrm %%PYTHON_SITELIBDIR%%/MythTV +%%BINDINGS%%@dirrmtry %%SITE_PERL%%/IO/Socket/INET +%%BINDINGS%%@dirrmtry %%SITE_PERL%%/IO/Socket +%%BINDINGS%%@dirrmtry %%SITE_PERL%%/IO +%%BINDINGS%%@dirrm %%SITE_PERL%%/MythTV @dirrm include/mythtv/zeromq @dirrm include/mythtv/upnp @dirrm include/mythtv/mpeg2dec diff --git a/www/mythplugin-mythweb/Makefile b/www/mythplugin-mythweb/Makefile index 402fadaba60b..258bdc3dabf3 100644 --- a/www/mythplugin-mythweb/Makefile +++ b/www/mythplugin-mythweb/Makefile @@ -2,22 +2,24 @@ # $FreeBSD$ PORTNAME= mythweb -PORTVERSION= 0.26.1 +PORTVERSION= 0.27 CATEGORIES= www -MASTER_SITES= http://ftp.osuosl.org/pub/mythtv/ \ - http://ftp.osuosl.org/pub/mythtv/old_releases/ \ - http://ftp.oregonstate.edu/pub/mythtv/ \ - http://ftp.oregonstate.edu/pub/mythtv/old_releases/ PKGNAMEPREFIX= mythplugin- -DISTNAME= mythplugins-${PORTVERSION} +DISTNAME= mythweb-${PORTVERSION} MAINTAINER= decke@FreeBSD.org COMMENT= A frontend for scheduling and managing recordings on your MythTV Box RUN_DEPENDS= p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql +USE_GITHUB= yes +GH_ACCOUNT= MythTV +GH_PROJECT= mythweb +GH_TAGNAME= v${PORTVERSION} + +WRKSRC= ${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-b1df7d2 + NO_BUILD= yes -USE_BZIP2= yes USE_PHP= spl session mysql pcre posix json SUB_FILES= pkg-message REINPLACE_ARGS= -i "" @@ -25,32 +27,26 @@ REINPLACE_ARGS= -i "" OPTIONS_DEFINE= APACHE LIGHTTPD OPTIONS_DEFAULT= APACHE -NO_STAGE= yes +LIGHTTPD_RUN_DEPENDS= lighttpd:${PORTSDIR}/www/lighttpd + .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MAPACHE} USE_APACHE_RUN= 22+ .endif -.if ${PORT_OPTIONS:MLIGHTTPD} -RUN_DEPENDS+= lighttpd:${PORTSDIR}/www/lighttpd -.endif - post-patch: @${REINPLACE_CMD} -e 's|/var/www/html|${WWWDIR}|' \ - ${WRKSRC}/mythweb/mythweb.conf.apache + ${WRKSRC}/mythweb.conf.apache @${REINPLACE_CMD} -e 's|/usr/bin/php-cgi|${LOCALBASE}/bin/php-cgi|' \ - ${WRKSRC}/mythweb/mythweb.conf.lighttpd + ${WRKSRC}/mythweb.conf.lighttpd do-install: - ${MKDIR} ${WWWDIR} - ${MKDIR} ${WWWDIR}/data - (cd ${WRKSRC}/mythweb/ && ${COPYTREE_SHARE} "*" ${WWWDIR} "! -name *.orig") - - ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR} - ${CHMOD} -R 775 ${WWWDIR}/data + ${MKDIR} ${STAGEDIR}${WWWDIR} + ${MKDIR} ${STAGEDIR}${WWWDIR}/data + (cd ${WRKSRC}/ && ${COPYTREE_SHARE} "*" ${STAGEDIR}${WWWDIR} "! -name *.orig") -post-install: - @${CAT} ${PKGMESSAGE} + ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR} + ${CHMOD} -R 775 ${STAGEDIR}${WWWDIR}/data .include <bsd.port.mk> diff --git a/www/mythplugin-mythweb/distinfo b/www/mythplugin-mythweb/distinfo index 9eb79c986f0e..04be9addd767 100644 --- a/www/mythplugin-mythweb/distinfo +++ b/www/mythplugin-mythweb/distinfo @@ -1,2 +1,2 @@ -SHA256 (mythplugins-0.26.1.tar.bz2) = 6db50887dac35471b408cc8365c84f2a8522be7045b8e81de13ff16d840fc928 -SIZE (mythplugins-0.26.1.tar.bz2) = 36718864 +SHA256 (mythweb-0.27.tar.gz) = fe1fdbe58b351cc0fe61638b78cc3eebffaf5c4bfe7bd749e3bf40460e6d1db5 +SIZE (mythweb-0.27.tar.gz) = 1686799 diff --git a/www/mythplugin-mythweb/files/patch-mythweb__modules__tv__tmpl__default__schedules.php b/www/mythplugin-mythweb/files/patch-mythweb__modules__tv__tmpl__default__schedules.php deleted file mode 100644 index 1daf3b11fc94..000000000000 --- a/www/mythplugin-mythweb/files/patch-mythweb__modules__tv__tmpl__default__schedules.php +++ /dev/null @@ -1,13 +0,0 @@ ---- mythweb/modules/tv/tmpl/default/schedules.php.orig 2012-05-30 23:22:20.000000000 +0200 -+++ mythweb/modules/tv/tmpl/default/schedules.php 2012-07-29 14:17:07.405673220 +0200 -@@ -85,6 +85,10 @@ - </tr> - </thead> - <?php -+ // Hack: Disable warnings about "Creating default -+ // object from empty value" from below line -+ // "$schedule->channel->name = '[ '.t('Any').' ]';" -+ ini_set('error_reporting', E_ERROR); - $prev_group = ''; - $cur_group = ''; - foreach ($the_schedules as $schedule) { diff --git a/www/mythplugin-mythweb/pkg-plist b/www/mythplugin-mythweb/pkg-plist index fce90d603fb0..c3fa3b140f52 100644 --- a/www/mythplugin-mythweb/pkg-plist +++ b/www/mythplugin-mythweb/pkg-plist @@ -1,4 +1,3 @@ -@comment $FreeBSD$ %%WWWDIR%%/INSTALL %%WWWDIR%%/LICENSE %%WWWDIR%%/README @@ -32,6 +31,7 @@ %%WWWDIR%%/includes/data_dir.php %%WWWDIR%%/includes/database.php %%WWWDIR%%/includes/db_update.php +%%WWWDIR%%/includes/defaults.php %%WWWDIR%%/includes/defines.php %%WWWDIR%%/includes/dynamic_strings.php %%WWWDIR%%/includes/errordisplay.php @@ -51,6 +51,7 @@ %%WWWDIR%%/js/AC_OETags.js %%WWWDIR%%/js/dialog/dialog.css %%WWWDIR%%/js/dialog/dialog.js +%%WWWDIR%%/js/jquery-1.9.1.min.js %%WWWDIR%%/js/libs/flowplayer/flowplayer.controls.swf %%WWWDIR%%/js/libs/flowplayer/flowplayer.js %%WWWDIR%%/js/libs/flowplayer/flowplayer.swf @@ -62,6 +63,7 @@ %%WWWDIR%%/js/prototip/prototip.css %%WWWDIR%%/js/prototip/prototip.js %%WWWDIR%%/js/prototype.js +%%WWWDIR%%/js/recommend.js %%WWWDIR%%/js/scriptaculous/builder.js %%WWWDIR%%/js/scriptaculous/controls.js %%WWWDIR%%/js/scriptaculous/dragdrop.js @@ -75,6 +77,8 @@ %%WWWDIR%%/js/utils.js %%WWWDIR%%/modules/_shared/lang/Catalan.cat %%WWWDIR%%/modules/_shared/lang/Catalan.lang +%%WWWDIR%%/modules/_shared/lang/Chinese_HK.cat +%%WWWDIR%%/modules/_shared/lang/Chinese_HK.lang %%WWWDIR%%/modules/_shared/lang/Czech.cat %%WWWDIR%%/modules/_shared/lang/Czech.lang %%WWWDIR%%/modules/_shared/lang/Danish.cat @@ -95,6 +99,8 @@ %%WWWDIR%%/modules/_shared/lang/French_CA.lang %%WWWDIR%%/modules/_shared/lang/German.cat %%WWWDIR%%/modules/_shared/lang/German.lang +%%WWWDIR%%/modules/_shared/lang/Greek.cat +%%WWWDIR%%/modules/_shared/lang/Greek.lang %%WWWDIR%%/modules/_shared/lang/Hungarian.cat %%WWWDIR%%/modules/_shared/lang/Hungarian.lang %%WWWDIR%%/modules/_shared/lang/Italian.cat @@ -166,9 +172,11 @@ %%WWWDIR%%/modules/mythweb/init.php %%WWWDIR%%/modules/mythweb/set_defaults.php %%WWWDIR%%/modules/mythweb/set_flvplayer.php +%%WWWDIR%%/modules/mythweb/set_recommend.php %%WWWDIR%%/modules/mythweb/set_session.php %%WWWDIR%%/modules/mythweb/tmpl/default/set_defaults.php %%WWWDIR%%/modules/mythweb/tmpl/default/set_flvplayer.php +%%WWWDIR%%/modules/mythweb/tmpl/default/set_recommend.php %%WWWDIR%%/modules/mythweb/tmpl/default/set_session.php %%WWWDIR%%/modules/mythweb/tmpl/lite/set_defaults.php %%WWWDIR%%/modules/mythweb/tmpl/lite/set_flvplayer.php @@ -243,6 +251,7 @@ %%WWWDIR%%/modules/tv/opensearch.php %%WWWDIR%%/modules/tv/playerProductInstall.swf %%WWWDIR%%/modules/tv/recorded.php +%%WWWDIR%%/modules/tv/recommended.php %%WWWDIR%%/modules/tv/schedules.php %%WWWDIR%%/modules/tv/schedules_custom.php %%WWWDIR%%/modules/tv/schedules_manual.php @@ -261,6 +270,7 @@ %%WWWDIR%%/modules/tv/tmpl/default/list_cell_program.php %%WWWDIR%%/modules/tv/tmpl/default/list_data.php %%WWWDIR%%/modules/tv/tmpl/default/recorded.php +%%WWWDIR%%/modules/tv/tmpl/default/recommended.php %%WWWDIR%%/modules/tv/tmpl/default/schedules.php %%WWWDIR%%/modules/tv/tmpl/default/schedules_custom.php %%WWWDIR%%/modules/tv/tmpl/default/schedules_manual.php @@ -314,6 +324,9 @@ %%WWWDIR%%/mythweb.pl %%WWWDIR%%/skins/clean_blue/backend_log.css %%WWWDIR%%/skins/clean_blue/header.css +%%WWWDIR%%/skins/clean_blue/img/apple-touch-icons/apple-touch-icon-114x114.png +%%WWWDIR%%/skins/clean_blue/img/apple-touch-icons/apple-touch-icon-72x72.png +%%WWWDIR%%/skins/clean_blue/img/apple-touch-icons/apple-touch-icon.png %%WWWDIR%%/skins/clean_blue/img/backend_log.png %%WWWDIR%%/skins/clean_blue/img/blue_fade.jpg %%WWWDIR%%/skins/clean_blue/img/favicon.ico @@ -327,6 +340,7 @@ %%WWWDIR%%/skins/clean_blue/img/flags/no_autoexpire.png %%WWWDIR%%/skins/clean_blue/img/flags/processing.png %%WWWDIR%%/skins/clean_blue/img/flags/stereo.png +%%WWWDIR%%/skins/clean_blue/img/flags/transcoded.png %%WWWDIR%%/skins/clean_blue/img/flags/watched.png %%WWWDIR%%/skins/clean_blue/img/flash_flv_icon.png %%WWWDIR%%/skins/clean_blue/img/grey_fade.jpg @@ -382,8 +396,19 @@ %%WWWDIR%%/skins/clean_blue/welcome.css %%WWWDIR%%/skins/default/backend_log.css %%WWWDIR%%/skins/default/header.css +%%WWWDIR%%/skins/default/img/apple-touch-icons/apple-touch-icon-114x114.png +%%WWWDIR%%/skins/default/img/apple-touch-icons/apple-touch-icon-72x72.png +%%WWWDIR%%/skins/default/img/apple-touch-icons/apple-touch-icon.png %%WWWDIR%%/skins/default/img/backend_log.png %%WWWDIR%%/skins/default/img/favicon.ico +%%WWWDIR%%/skins/default/img/feelings/dislike-active.png +%%WWWDIR%%/skins/default/img/feelings/dislike-inactive.png +%%WWWDIR%%/skins/default/img/feelings/like-active.png +%%WWWDIR%%/skins/default/img/feelings/like-inactive.png +%%WWWDIR%%/skins/default/img/feelings/meh-active.png +%%WWWDIR%%/skins/default/img/feelings/meh-inactive.png +%%WWWDIR%%/skins/default/img/feelings/star-active.png +%%WWWDIR%%/skins/default/img/feelings/star-inactive.png %%WWWDIR%%/skins/default/img/flags/autoexpire.png %%WWWDIR%%/skins/default/img/flags/bookmark.png %%WWWDIR%%/skins/default/img/flags/cc.png @@ -394,6 +419,7 @@ %%WWWDIR%%/skins/default/img/flags/no_autoexpire.png %%WWWDIR%%/skins/default/img/flags/processing.png %%WWWDIR%%/skins/default/img/flags/stereo.png +%%WWWDIR%%/skins/default/img/flags/transcoded.png %%WWWDIR%%/skins/default/img/flags/watched.png %%WWWDIR%%/skins/default/img/flash_flv_icon.png %%WWWDIR%%/skins/default/img/iCal2.0.png @@ -448,6 +474,9 @@ %%WWWDIR%%/skins/default/welcome.css %%WWWDIR%%/skins/elkin/backend_log.css %%WWWDIR%%/skins/elkin/header.css +%%WWWDIR%%/skins/elkin/img/apple-touch-icons/apple-touch-icon-114x114.png +%%WWWDIR%%/skins/elkin/img/apple-touch-icons/apple-touch-icon-72x72.png +%%WWWDIR%%/skins/elkin/img/apple-touch-icons/apple-touch-icon.png %%WWWDIR%%/skins/elkin/img/backend_log.png %%WWWDIR%%/skins/elkin/img/background-gradient-h.png %%WWWDIR%%/skins/elkin/img/background-gradient.png @@ -462,6 +491,7 @@ %%WWWDIR%%/skins/elkin/img/flags/no_autoexpire.png %%WWWDIR%%/skins/elkin/img/flags/processing.png %%WWWDIR%%/skins/elkin/img/flags/stereo.png +%%WWWDIR%%/skins/elkin/img/flags/transcoded.png %%WWWDIR%%/skins/elkin/img/flags/watched.png %%WWWDIR%%/skins/elkin/img/flash_flv_icon.png %%WWWDIR%%/skins/elkin/img/left.gif @@ -516,6 +546,9 @@ %%WWWDIR%%/skins/errors.css %%WWWDIR%%/skins/grey/backend_log.css %%WWWDIR%%/skins/grey/header.css +%%WWWDIR%%/skins/grey/img/apple-touch-icons/apple-touch-icon-114x114.png +%%WWWDIR%%/skins/grey/img/apple-touch-icons/apple-touch-icon-72x72.png +%%WWWDIR%%/skins/grey/img/apple-touch-icons/apple-touch-icon.png %%WWWDIR%%/skins/grey/img/backend_log.png %%WWWDIR%%/skins/grey/img/favicon.ico %%WWWDIR%%/skins/grey/img/flags/autoexpire.png @@ -528,6 +561,7 @@ %%WWWDIR%%/skins/grey/img/flags/no_autoexpire.png %%WWWDIR%%/skins/grey/img/flags/processing.png %%WWWDIR%%/skins/grey/img/flags/stereo.png +%%WWWDIR%%/skins/grey/img/flags/transcoded.png %%WWWDIR%%/skins/grey/img/flags/watched.png %%WWWDIR%%/skins/grey/img/left.gif %%WWWDIR%%/skins/grey/img/left_sm.png @@ -560,6 +594,9 @@ %%WWWDIR%%/skins/grey/welcome.css %%WWWDIR%%/skins/haze_dark/backend_log.css %%WWWDIR%%/skins/haze_dark/header.css +%%WWWDIR%%/skins/haze_dark/img/apple-touch-icons/apple-touch-icon-114x114.png +%%WWWDIR%%/skins/haze_dark/img/apple-touch-icons/apple-touch-icon-72x72.png +%%WWWDIR%%/skins/haze_dark/img/apple-touch-icons/apple-touch-icon.png %%WWWDIR%%/skins/haze_dark/img/backend_log.png %%WWWDIR%%/skins/haze_dark/img/favicon.ico %%WWWDIR%%/skins/haze_dark/img/left.gif @@ -589,6 +626,9 @@ %%WWWDIR%%/skins/haze_dark/welcome.css %%WWWDIR%%/skins/haze_light/backend_log.css %%WWWDIR%%/skins/haze_light/header.css +%%WWWDIR%%/skins/haze_light/img/apple-touch-icons/apple-touch-icon-114x114.png +%%WWWDIR%%/skins/haze_light/img/apple-touch-icons/apple-touch-icon-72x72.png +%%WWWDIR%%/skins/haze_light/img/apple-touch-icons/apple-touch-icon.png %%WWWDIR%%/skins/haze_light/img/backend_log.png %%WWWDIR%%/skins/haze_light/img/favicon.ico %%WWWDIR%%/skins/haze_light/img/left.gif @@ -616,30 +656,41 @@ %%WWWDIR%%/skins/haze_light/tv_upcoming.css %%WWWDIR%%/skins/haze_light/welcome.css %%WWWDIR%%/skins/wap/handheld.css +%%WWWDIR%%/skins/wap/img/apple-touch-icons/apple-touch-icon-114x114.png +%%WWWDIR%%/skins/wap/img/apple-touch-icons/apple-touch-icon-72x72.png +%%WWWDIR%%/skins/wap/img/apple-touch-icons/apple-touch-icon.png %%WWWDIR%%/skins/wap/img/mythtv-logo.gif %%WWWDIR%%/skins/wap/img/spacer.gif %%WWWDIR%%/skins/wap/style.css %%WWWDIR%%/tests/testUPnP.php @dirrm %%WWWDIR%%/tests +@dirrm %%WWWDIR%%/skins/wap/img/apple-touch-icons @dirrm %%WWWDIR%%/skins/wap/img @dirrm %%WWWDIR%%/skins/wap +@dirrm %%WWWDIR%%/skins/haze_light/img/apple-touch-icons @dirrm %%WWWDIR%%/skins/haze_light/img @dirrm %%WWWDIR%%/skins/haze_light +@dirrm %%WWWDIR%%/skins/haze_dark/img/apple-touch-icons @dirrm %%WWWDIR%%/skins/haze_dark/img @dirrm %%WWWDIR%%/skins/haze_dark @dirrm %%WWWDIR%%/skins/grey/img/flags +@dirrm %%WWWDIR%%/skins/grey/img/apple-touch-icons @dirrm %%WWWDIR%%/skins/grey/img @dirrm %%WWWDIR%%/skins/grey @dirrm %%WWWDIR%%/skins/elkin/img/music @dirrm %%WWWDIR%%/skins/elkin/img/flags +@dirrm %%WWWDIR%%/skins/elkin/img/apple-touch-icons @dirrm %%WWWDIR%%/skins/elkin/img @dirrm %%WWWDIR%%/skins/elkin @dirrm %%WWWDIR%%/skins/default/img/music @dirrm %%WWWDIR%%/skins/default/img/flags +@dirrm %%WWWDIR%%/skins/default/img/feelings +@dirrm %%WWWDIR%%/skins/default/img/apple-touch-icons @dirrm %%WWWDIR%%/skins/default/img @dirrm %%WWWDIR%%/skins/default @dirrm %%WWWDIR%%/skins/clean_blue/img/music @dirrm %%WWWDIR%%/skins/clean_blue/img/flags +@dirrm %%WWWDIR%%/skins/clean_blue/img/apple-touch-icons @dirrm %%WWWDIR%%/skins/clean_blue/img @dirrm %%WWWDIR%%/skins/clean_blue @dirrm %%WWWDIR%%/skins |