diff options
23 files changed, 421 insertions, 300 deletions
diff --git a/audio/mythplugin-mythmusic/Makefile b/audio/mythplugin-mythmusic/Makefile index 9762286788a4..bbfd3de2b74e 100644 --- a/audio/mythplugin-mythmusic/Makefile +++ b/audio/mythplugin-mythmusic/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: mythplugin-mythmusic -# Date created: 2010-03-07 -# Whom: Bernhard Froehlich <decke@bluelife.at> -# +# Created by: Bernhard Froehlich <decke@bluelife.at> # $FreeBSD$ -# PORTNAME= mythmusic -PORTVERSION= 0.25.2 +PORTVERSION= 0.26.0 CATEGORIES= audio MASTER_SITES= http://ftp.osuosl.org/pub/mythtv/ \ http://ftp.osuosl.org/pub/mythtv/old_releases/ \ diff --git a/audio/mythplugin-mythmusic/distinfo b/audio/mythplugin-mythmusic/distinfo index f909e59ab41f..a7c45c312967 100644 --- a/audio/mythplugin-mythmusic/distinfo +++ b/audio/mythplugin-mythmusic/distinfo @@ -1,2 +1,2 @@ -SHA256 (mythplugins-0.25.2.tar.bz2) = e8507dcddfbb63ab50fe738400639c20bf2f2a278a8947fa85d9096e537f11f3 -SIZE (mythplugins-0.25.2.tar.bz2) = 36763594 +SHA256 (mythplugins-0.26.0.tar.bz2) = 4e7f0493f37792c084c1b4d0b5863b4201ebce6d62ab7c6cc31ca74087d83c62 +SIZE (mythplugins-0.26.0.tar.bz2) = 36673620 diff --git a/audio/mythplugin-mythmusic/files/patch-settings.pro b/audio/mythplugin-mythmusic/files/patch-settings.pro deleted file mode 100644 index 815eb72838c1..000000000000 --- a/audio/mythplugin-mythmusic/files/patch-settings.pro +++ /dev/null @@ -1,11 +0,0 @@ ---- settings.pro.orig 2012-04-10 07:29:22.000000000 +0200 -+++ settings.pro 2012-04-13 21:31:59.774177979 +0200 -@@ -2,7 +2,7 @@ - - LIBVERSION = 0.25 - --INCLUDEPATH += $${SYSROOT}$${PREFIX}/include -+#INCLUDEPATH += $${SYSROOT}$${PREFIX}/include - #INCLUDEPATH += /usr/include/cdda - #INCLUDEPATH += /usr/include/FLAC - diff --git a/audio/mythplugin-mythmusic/pkg-plist b/audio/mythplugin-mythmusic/pkg-plist index 885a84863142..09d866cbc70f 100644 --- a/audio/mythplugin-mythmusic/pkg-plist +++ b/audio/mythplugin-mythmusic/pkg-plist @@ -26,6 +26,7 @@ lib/mythtv/plugins/libmythmusic.so %%MYTHSHARE%%/i18n/mythmusic_sv.qm %%MYTHSHARE%%/music_settings.xml %%MYTHSHARE%%/musicmenu.xml +%%MYTHSHARE%%/mythmusic/streams.xml %%MYTHSHARE%%/themes/default-wide/mm-titlelines.png %%MYTHSHARE%%/themes/default-wide/mm_blackhole_border.png %%MYTHSHARE%%/themes/default-wide/mm_volume_background.png @@ -34,6 +35,7 @@ lib/mythtv/plugins/libmythmusic.so %%MYTHSHARE%%/themes/default-wide/music-sel-bg.png %%MYTHSHARE%%/themes/default-wide/music-ui.xml %%MYTHSHARE%%/themes/default-wide/musicsettings-ui.xml +%%MYTHSHARE%%/themes/default-wide/stream-ui.xml %%MYTHSHARE%%/themes/default/ff_button_off.png %%MYTHSHARE%%/themes/default/ff_button_on.png %%MYTHSHARE%%/themes/default/ff_button_pushed.png @@ -49,6 +51,7 @@ lib/mythtv/plugins/libmythmusic.so %%MYTHSHARE%%/themes/default/mm_compartists.png %%MYTHSHARE%%/themes/default/mm_compilations.png %%MYTHSHARE%%/themes/default/mm_descending.png +%%MYTHSHARE%%/themes/default/mm_directory.png %%MYTHSHARE%%/themes/default/mm_down_arrow.png %%MYTHSHARE%%/themes/default/mm_folder.png %%MYTHSHARE%%/themes/default/mm_genres.png @@ -117,4 +120,6 @@ lib/mythtv/plugins/libmythmusic.so %%MYTHSHARE%%/themes/default/stop_button_on.png %%MYTHSHARE%%/themes/default/stop_button_pushed.png %%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 a50004a7ecc1..66666a94f356 100644 --- a/multimedia/mythtv-frontend/Makefile +++ b/multimedia/mythtv-frontend/Makefile @@ -1,12 +1,8 @@ -# -# Ports collection makefile for: mythtv-frontend -# Date created: 14 September 2008 -# Whom: Bernhard Fröhlich <decke@bluelife.at> -# +# Created by: Bernhard Froehlich <decke@bluelife.at> # $FreeBSD$ PORTNAME= mythtv-frontend -PORTVERSION= 0.25.2 +PORTVERSION= 0.26.0 CATEGORIES= multimedia MASTER_SITES= http://ftp.osuosl.org/pub/mythtv/ \ http://ftp.osuosl.org/pub/mythtv/old_releases/ \ @@ -17,7 +13,8 @@ DISTNAME= mythtv-${PORTVERSION} MAINTAINER= decke@FreeBSD.org COMMENT= MythTV is a homebrew PVR project -BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat +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 @@ -52,35 +49,40 @@ QMAKESPEC?= ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ DESKTOP_ENTRIES="MythTV Frontend" "MythTV is a homebrew PVR project" "" \ "mythfrontend" "AudioVideo;Video;" false -OPTIONS= JACK "JACK sound driver" off \ - OPENGL "OpenGL support" on \ - PULSEAUDIO "PulseAudio audio output support" off \ - VDPAU "VDPAU support (nvidia only)" off +OPTIONS_DEFINE= OPENGL JACK PULSEAUDIO VDPAU +OPTIONS_DEFAULT= OPENGL .include <bsd.port.pre.mk> -.if defined(WITH_JACK) +# for too old binutils in base +.if ${OSVERSION} < 900033 +BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils +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 defined(WITH_OPENGL) +.if ${PORT_OPTIONS:MOPENGL} USE_QT4+= opengl CONFIGURE_ARGS+= --enable-opengl-video .else CONFIGURE_ARGS+= --disable-opengl-video .endif -.if defined(WITH_PULSEAUDIO) +.if ${PORT_OPTIONS:MPULSEAUDIO} LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio CONFIGURE_ARGS+= --enable-audio-pulseoutput .else CONFIGURE_ARGS+= --disable-audio-pulseoutput .endif -.if defined(WITH_VDPAU) +.if ${PORT_OPTIONS:MVDPAU} LIB_DEPENDS+= vdpau.1:${PORTSDIR}/multimedia/libvdpau CONFIGURE_ARGS+= --enable-vdpau .else diff --git a/multimedia/mythtv-frontend/distinfo b/multimedia/mythtv-frontend/distinfo index fa432f20bc4a..807401c050fd 100644 --- a/multimedia/mythtv-frontend/distinfo +++ b/multimedia/mythtv-frontend/distinfo @@ -1,2 +1,2 @@ -SHA256 (mythtv-0.25.2.tar.bz2) = d6b7f1692f30b3dde170d2b755453675de1d222aa8556197e62b8d8617beeac6 -SIZE (mythtv-0.25.2.tar.bz2) = 31838320 +SHA256 (mythtv-0.26.0.tar.bz2) = 2f158962ca3009db563dabc32827c47788a688bd67a25abd76f4baa9c3cfe306 +SIZE (mythtv-0.26.0.tar.bz2) = 40887666 diff --git a/multimedia/mythtv-frontend/files/patch-configure b/multimedia/mythtv-frontend/files/patch-configure index df490e145ddd..ec18184b8f97 100644 --- a/multimedia/mythtv-frontend/files/patch-configure +++ b/multimedia/mythtv-frontend/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2012-03-19 06:39:10.000000000 +0100 -+++ configure 2012-03-21 23:40:37.060067228 +0100 -@@ -734,21 +734,21 @@ +--- configure.orig 2012-10-02 12:30:24.000000000 +0200 ++++ configure 2012-10-03 19:27:16.773415414 +0200 +@@ -731,21 +731,21 @@ log check_cc "$@" cat > $TMPC log_file $TMPC @@ -8,6 +8,14 @@ + check_cmd $cc $CPPFLAGS $CFLAGS -I${prefix}/include "$@" -c -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_cpp(){ log check_cpp "$@" cat > $TMPC @@ -16,16 +24,8 @@ + check_cmd $cc $CPPFLAGS $CFLAGS -I${prefix}/include "$@" -E -o $TMPO $TMPC } - check_cxx(){ - log check_cxx "$@" - cat > $TMPCXX - log_file $TMPCXX -- check_cmd $cxx $CXXPPFLAGS $ECXXFLAGS "$@" -c -o $TMPO $TMPCXX -+ check_cmd $cxx $CXXPPFLAGS $ECXXFLAGS -I${prefix}/include "$@" -c -o $TMPO $TMPCXX - } - check_as(){ -@@ -1942,7 +1942,7 @@ +@@ -2152,7 +2152,7 @@ # machine arch_default=$(uname -m) @@ -34,8 +34,8 @@ processor=`uname -p 2>/dev/null` processor_flags="" tune="generic" -@@ -2920,7 +2920,7 @@ - i686|pentiumpro|pentium[23]|pentium-m|athlon|athlon-tbird|athlon-4|athlon-[mx]p|athlon64|k8|opteron|athlon-fx|k8-sse3|opteron-sse3|athlon64-sse3|core2|amdfam10|barcelona|atom) +@@ -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) cpuflags="-march=$cpu" enable cmov - enable fast_cmov @@ -43,15 +43,15 @@ ;; # targets that do support conditional mov but on which it's slow pentium4|pentium4m|prescott|nocona) -@@ -3120,7 +3120,6 @@ - enable malloc_aligned +@@ -3401,7 +3401,6 @@ + append CCONFIG "freebsd" # Workaround compile errors from missing u_int/uint def CPPFLAGS=`echo $CPPFLAGS | sed 's/-D_POSIX_C_SOURCE=200112//'` - disable ivtv enable backend ;; bsd/os) -@@ -4962,6 +4961,8 @@ +@@ -5427,6 +5426,8 @@ QMAKE_LIBDIR_QT-=${sysroot}${libdir} QMAKE_LIBDIR-=${sysroot}${libdir} LATE_LIBS+=-L${sysroot}${libdir} @@ -60,7 +60,7 @@ EOF #echo "endif # FFMPEG_CONFIG_MAK" >> $TMPMAK -@@ -5012,7 +5013,7 @@ +@@ -5477,7 +5478,7 @@ BINDIR=\$(INSTALL_ROOT)$bindir DATADIR=\$(INSTALL_ROOT)$datadir MANDIR=\$(INSTALL_ROOT)$mandir diff --git a/multimedia/mythtv-frontend/files/patch-extern__zeromq__doc__Makefile.in b/multimedia/mythtv-frontend/files/patch-extern__zeromq__doc__Makefile.in new file mode 100644 index 000000000000..0630820f8d82 --- /dev/null +++ b/multimedia/mythtv-frontend/files/patch-extern__zeromq__doc__Makefile.in @@ -0,0 +1,11 @@ +--- external/zeromq/doc/Makefile.in.orig 2012-10-02 12:30:24.000000000 +0200 ++++ external/zeromq/doc/Makefile.in 2012-10-20 16:56:13.777947694 +0200 +@@ -476,7 +476,7 @@ + + install-info-am: + +-install-man: install-man3 install-man7 ++install-man: + + install-pdf: install-pdf-am + diff --git a/multimedia/mythtv-frontend/files/patch-external__FFmpeg__libavcodec__Makefile b/multimedia/mythtv-frontend/files/patch-external__FFmpeg__libavcodec__Makefile deleted file mode 100644 index 2f3a9b67c3f1..000000000000 --- a/multimedia/mythtv-frontend/files/patch-external__FFmpeg__libavcodec__Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- external/FFmpeg/libavcodec/Makefile.orig 2010-11-01 21:14:42.000000000 +0100 -+++ external/FFmpeg/libavcodec/Makefile 2010-11-01 20:30:35.000000000 +0100 -@@ -631,7 +631,7 @@ - # well. - OBJS-$(!CONFIG_SMALL) += inverse.o - ---include $(SUBDIR)$(ARCH)/Makefile -+-include $(SUBDIR)x86/Makefile - - SKIPHEADERS = %_tablegen.h - SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h diff --git a/multimedia/mythtv-frontend/files/patch-programs__mythtranscode__transcode.cpp b/multimedia/mythtv-frontend/files/patch-programs__mythtranscode__transcode.cpp deleted file mode 100644 index aab1bde45ded..000000000000 --- a/multimedia/mythtv-frontend/files/patch-programs__mythtranscode__transcode.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/mythtranscode/transcode.cpp.orig 2012-03-19 06:39:10.000000000 +0100 -+++ programs/mythtranscode/transcode.cpp 2012-03-24 18:25:25.121052981 +0100 -@@ -484,7 +484,7 @@ - { - return false; - } -- else if (abs(audioFramesToCut - frames) < audioFramesToCut) -+ else if (llabs(audioFramesToCut - frames) < audioFramesToCut) - { - // Drop the packet containing these frames if doing - // so gets us closer to zero left to drop diff --git a/multimedia/mythtv-frontend/pkg-plist b/multimedia/mythtv-frontend/pkg-plist index 5bfecfa345d3..214dc7f46d85 100644 --- a/multimedia/mythtv-frontend/pkg-plist +++ b/multimedia/mythtv-frontend/pkg-plist @@ -6,6 +6,7 @@ bin/mythffmpeg bin/mythfrontend bin/mythjobqueue bin/mythlcdserver +bin/mythlogserver bin/mythmediaserver bin/mythpreviewgen bin/mythreplex @@ -13,10 +14,20 @@ bin/mythshutdown bin/mythtranscode bin/mythutil bin/mythwelcome +include/mythtv/QJson/Parser +include/mythtv/QJson/QObjectHelper +include/mythtv/QJson/Serializer +include/mythtv/QJson/parser.h +include/mythtv/QJson/parserrunnable.h +include/mythtv/QJson/qjson_export.h +include/mythtv/QJson/qobjecthelper.h +include/mythtv/QJson/serializer.h +include/mythtv/QJson/serializerrunnable.h include/mythtv/audiooutput.h include/mythtv/audiooutputsettings.h include/mythtv/audiosettings.h include/mythtv/autodeletedeque.h +include/mythtv/bswap.h include/mythtv/bluray/attributes.h include/mythtv/bluray/bdparse.h include/mythtv/bluray/bits.h @@ -56,6 +67,7 @@ include/mythtv/dvdread/nav_read.h include/mythtv/dvdread/nav_types.h include/mythtv/eldutils.h include/mythtv/exitcodes.h +include/mythtv/ffmpeg-mmx.h include/mythtv/filesysteminfo.h include/mythtv/hardwareprofile.h include/mythtv/httpcomms.h @@ -63,38 +75,50 @@ 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/mmx.h -include/mythtv/libavcodec/opt.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/libavfilter/asrc_abuffer.h +include/mythtv/libavfilter/avcodec.h include/mythtv/libavfilter/avfilter.h 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 include/mythtv/libavutil/adler32.h +include/mythtv/libavutil/aes.h include/mythtv/libavutil/attributes.h +include/mythtv/libavutil/audio_fifo.h include/mythtv/libavutil/audioconvert.h include/mythtv/libavutil/avassert.h include/mythtv/libavutil/avconfig.h include/mythtv/libavutil/avstring.h include/mythtv/libavutil/avutil.h include/mythtv/libavutil/base64.h +include/mythtv/libavutil/bprint.h include/mythtv/libavutil/bswap.h include/mythtv/libavutil/common.h include/mythtv/libavutil/cpu.h include/mythtv/libavutil/crc.h +include/mythtv/libavutil/dict.h include/mythtv/libavutil/error.h include/mythtv/libavutil/eval.h include/mythtv/libavutil/fifo.h include/mythtv/libavutil/file.h include/mythtv/libavutil/imgutils.h include/mythtv/libavutil/intfloat_readwrite.h +include/mythtv/libavutil/intfloat.h include/mythtv/libavutil/intreadwrite.h include/mythtv/libavutil/lfg.h include/mythtv/libavutil/log.h @@ -109,7 +133,9 @@ include/mythtv/libavutil/pixfmt.h include/mythtv/libavutil/random_seed.h include/mythtv/libavutil/rational.h include/mythtv/libavutil/samplefmt.h -include/mythtv/libavutil/sha1.h +include/mythtv/libavutil/sha.h +include/mythtv/libavutil/timecode.h +include/mythtv/libavutil/timestamp.h include/mythtv/libmyth/audiooutput.h include/mythtv/libmyth/audiooutputsettings.h include/mythtv/libmyth/audiosettings.h @@ -148,15 +174,18 @@ include/mythtv/libmyth/volumebase.h include/mythtv/libmyth/xmlparse.h include/mythtv/libmythbase/autodeletedeque.h include/mythtv/libmythbase/bonjourregister.h +include/mythtv/libmythbase/bswap.h include/mythtv/libmythbase/compat.h include/mythtv/libmythbase/dbutil.h 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 @@ -168,6 +197,7 @@ include/mythtv/libmythbase/mythconfig.h include/mythtv/libmythbase/mythconfig.mak include/mythtv/libmythbase/mythcorecontext.h include/mythtv/libmythbase/mythcoreutil.h +include/mythtv/libmythbase/mythdate.h include/mythtv/libmythbase/mythdb.h include/mythtv/libmythbase/mythdbcon.h include/mythtv/libmythbase/mythdbparams.h @@ -181,6 +211,7 @@ 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/mythsocket.h include/mythtv/libmythbase/mythsocket_cb.h include/mythtv/libmythbase/mythstorage.h @@ -285,6 +316,7 @@ include/mythtv/libmythui/themeinfo.h include/mythtv/libmythui/x11colors.h include/mythtv/libmythui/xmlparsebase.h include/mythtv/libpostproc/postprocess.h +include/mythtv/libswresample/swresample.h include/mythtv/libswscale/swscale.h include/mythtv/mcodecs.h include/mythtv/metadata/bluraymetadata.h @@ -321,6 +353,7 @@ include/mythtv/mythconfiggroups.h include/mythtv/mythcontext.h include/mythtv/mythcorecontext.h include/mythtv/mythcoreutil.h +include/mythtv/mythdate.h include/mythtv/mythdb.h include/mythtv/mythdbcon.h include/mythtv/mythdbparams.h @@ -353,6 +386,7 @@ include/mythtv/mythwidgets.h include/mythtv/mythwizard.h include/mythtv/netgrabbermanager.h include/mythtv/netutils.h +include/mythtv/nzmqt/nzmqt.hpp include/mythtv/oldsettings.h include/mythtv/output.h include/mythtv/playgroup.h @@ -368,6 +402,7 @@ include/mythtv/samplerate.h include/mythtv/schemawizard.h include/mythtv/serverpool.h include/mythtv/settings.h +include/mythtv/signalhandling.h include/mythtv/storagegroup.h include/mythtv/storagegroupeditor.h include/mythtv/uitypes.h @@ -407,65 +442,83 @@ include/mythtv/virtualkeyboard_qt.h include/mythtv/visual.h include/mythtv/volumebase.h include/mythtv/xmlparse.h -lib/libmyth-0.25.so -lib/libmyth-0.25.so.0 -lib/libmyth-0.25.so.0.25 -lib/libmyth-0.25.so.0.25.0 +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/libmythavcodec.so -lib/libmythavcodec.so.52 -lib/libmythavcodec.so.52.113.1 +lib/libmythavcodec.so.54 +lib/libmythavcodec.so.54.23.100 lib/libmythavdevice.so -lib/libmythavdevice.so.52 -lib/libmythavdevice.so.52.2.3 +lib/libmythavdevice.so.54 +lib/libmythavdevice.so.54.0.100 lib/libmythavfilter.so -lib/libmythavfilter.so.1 -lib/libmythavfilter.so.1.76.0 +lib/libmythavfilter.so.2 +lib/libmythavfilter.so.2.77.100 lib/libmythavformat.so -lib/libmythavformat.so.52 -lib/libmythavformat.so.52.101.0 +lib/libmythavformat.so.54 +lib/libmythavformat.so.54.6.101 lib/libmythavutil.so -lib/libmythavutil.so.50 -lib/libmythavutil.so.50.39.0 -lib/libmythbase-0.25.so -lib/libmythbase-0.25.so.0 -lib/libmythbase-0.25.so.0.25 -lib/libmythbase-0.25.so.0.25.0 -lib/libmythbluray-0.25.a -lib/libmythdvdnav-0.25.a -lib/libmythfreemheg-0.25.so -lib/libmythfreemheg-0.25.so.0 -lib/libmythfreemheg-0.25.so.0.25 -lib/libmythfreemheg-0.25.so.0.25.0 -lib/libmythmetadata-0.25.so -lib/libmythmetadata-0.25.so.0 -lib/libmythmetadata-0.25.so.0.25 -lib/libmythmetadata-0.25.so.0.25.0 +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/libmythnzmqt.so +lib/libmythnzmqt.so.0 +lib/libmythnzmqt.so.0.26 +lib/libmythnzmqt.so.0.26.0 lib/libmythpostproc.so -lib/libmythpostproc.so.51 -lib/libmythpostproc.so.51.2.0 -lib/libmythprotoserver-0.25.so -lib/libmythprotoserver-0.25.so.0 -lib/libmythprotoserver-0.25.so.0.25 -lib/libmythprotoserver-0.25.so.0.25.0 -lib/libmythservicecontracts-0.25.so -lib/libmythservicecontracts-0.25.so.0 -lib/libmythservicecontracts-0.25.so.0.25 -lib/libmythservicecontracts-0.25.so.0.25.0 +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/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/libmythswresample.so +lib/libmythswresample.so.0 +lib/libmythswresample.so.0.15.100 lib/libmythswscale.so -lib/libmythswscale.so.0 -lib/libmythswscale.so.0.12.0 -lib/libmythtv-0.25.so -lib/libmythtv-0.25.so.0 -lib/libmythtv-0.25.so.0.25 -lib/libmythtv-0.25.so.0.25.0 -lib/libmythui-0.25.so -lib/libmythui-0.25.so.0 -lib/libmythui-0.25.so.0.25 -lib/libmythui-0.25.so.0.25.0 -lib/libmythupnp-0.25.so -lib/libmythupnp-0.25.so.0 -lib/libmythupnp-0.25.so.0.25 -lib/libmythupnp-0.25.so.0.25.0 +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/libmythzmq.a +lib/libmythzmq.la +lib/libmythzmq.so +lib/libmythzmq.so.1 lib/mythtv/filters/libadjust.so lib/mythtv/filters/libbobdeint.so lib/mythtv/filters/libcrop.so @@ -480,18 +533,42 @@ lib/mythtv/filters/liblinearblend.so lib/mythtv/filters/libonefield.so lib/mythtv/filters/libpostprocess.so lib/mythtv/filters/libquickdnr.so +lib/mythtv/filters/libvflip.so lib/mythtv/filters/libyadif.so +lib/pkgconfig/libmythzmq.pc %%DATADIR%%/CDS_scpd.xml %%DATADIR%%/CMGR_scpd.xml %%DATADIR%%/MFEXML_scpd.xml %%DATADIR%%/MSRR_scpd.xml +%%DATADIR%%/fonts/DroidSans-Bold.ttf +%%DATADIR%%/fonts/DroidSans.ttf +%%DATADIR%%/fonts/DroidSansMono.ttf +%%DATADIR%%/fonts/DroidSerif-Bold.ttf +%%DATADIR%%/fonts/DroidSerif-BoldItalic.ttf +%%DATADIR%%/fonts/DroidSerif-Italic.ttf +%%DATADIR%%/fonts/DroidSerif-Regular.ttf %%DATADIR%%/fonts/FreeMono.ttf +%%DATADIR%%/fonts/FreeMonoBold.ttf +%%DATADIR%%/fonts/FreeMonoBoldOblique.ttf +%%DATADIR%%/fonts/FreeMonoOblique.ttf %%DATADIR%%/fonts/FreeSans.ttf %%DATADIR%%/fonts/FreeSansBold.ttf +%%DATADIR%%/fonts/FreeSansBoldOblique.ttf +%%DATADIR%%/fonts/FreeSansOblique.ttf +%%DATADIR%%/fonts/FreeSerif.ttf +%%DATADIR%%/fonts/FreeSerifBold.ttf +%%DATADIR%%/fonts/FreeSerifBoldItalic.ttf +%%DATADIR%%/fonts/FreeSerifItalic.ttf +%%DATADIR%%/fonts/Purisa.ttf +%%DATADIR%%/fonts/README-TeX-Gyre-Chorus.txt +%%DATADIR%%/fonts/README-droid.txt +%%DATADIR%%/fonts/README-freefont-20120503.txt +%%DATADIR%%/fonts/README-purisa.txt %%DATADIR%%/fonts/Tiresias Infofont Bold.ttf %%DATADIR%%/fonts/Tiresias Infofont Italic.ttf %%DATADIR%%/fonts/Tiresias Infofont.ttf %%DATADIR%%/fonts/tiresias_gpl3.txt +%%DATADIR%%/fonts/texgyrechorus-mediumitalic.otf %%DATADIR%%/html/3rdParty/jwplayer.qsp %%DATADIR%%/html/css/Status.css %%DATADIR%%/html/css/images/ui-bg_flat_30_cccccc_40x100.png @@ -588,9 +665,9 @@ lib/mythtv/filters/libyadif.so %%DATADIR%%/html/misc/database-backup.html %%DATADIR%%/html/misc/database-repair.html %%DATADIR%%/html/misc/databasetabs.html +%%DATADIR%%/html/misc/hardwareprofile.html %%DATADIR%%/html/misc/hardwareprofile-general.html %%DATADIR%%/html/misc/hardwareprofile-myprofile.html -%%DATADIR%%/html/misc/hardwareprofile.html %%DATADIR%%/html/misc/js/databasetabs.js %%DATADIR%%/html/misc/js/hardwareprofile.js %%DATADIR%%/html/misc/js/messagetab.js @@ -686,6 +763,7 @@ lib/mythtv/filters/libyadif.so %%DATADIR%%/locales/nb_no.xml %%DATADIR%%/locales/ru_ru.xml %%DATADIR%%/locales/zh_hk.xml +%%DATADIR%%/locales/zh_tw.xml %%DATADIR%%/themes/DVR/dvr-preview.png %%DATADIR%%/themes/DVR/main_settings.xml %%DATADIR%%/themes/DVR/mainmenu.xml @@ -704,9 +782,6 @@ lib/mythtv/filters/libyadif.so %%DATADIR%%/themes/MythCenter-wide/base.xml %%DATADIR%%/themes/MythCenter-wide/config-ui.xml %%DATADIR%%/themes/MythCenter-wide/controls-ui.xml -%%DATADIR%%/themes/MythCenter-wide/fonts/DroidSans.ttf -%%DATADIR%%/themes/MythCenter-wide/fonts/DroidSans-Bold.ttf -%%DATADIR%%/themes/MythCenter-wide/fonts/LICENSE %%DATADIR%%/themes/MythCenter-wide/htmls/progdetails_page1.html %%DATADIR%%/themes/MythCenter-wide/htmls/progdetails_page2.html %%DATADIR%%/themes/MythCenter-wide/keyboard/keyboard.xml @@ -1635,6 +1710,7 @@ lib/mythtv/filters/libyadif.so %%DATADIR%%/themes/default/mythfilebrowser-background.png %%DATADIR%%/themes/default/mythprogressdialog-background.png %%DATADIR%%/themes/default/osd.xml +%%DATADIR%%/themes/default/osd_subtitle.xml %%DATADIR%%/themes/default/pd-background.png %%DATADIR%%/themes/default/pf-background.png %%DATADIR%%/themes/default/pf-lines.png @@ -1790,7 +1866,6 @@ lib/mythtv/filters/libyadif.so @dirrm %%DATADIR%%/themes/MythCenter-wide/osd @dirrm %%DATADIR%%/themes/MythCenter-wide/keyboard @dirrm %%DATADIR%%/themes/MythCenter-wide/htmls -@dirrm %%DATADIR%%/themes/MythCenter-wide/fonts @dirrm %%DATADIR%%/themes/MythCenter-wide @dirrm %%DATADIR%%/themes/MythCenter @dirrm %%DATADIR%%/themes/DVR @@ -1817,13 +1892,17 @@ lib/mythtv/filters/libyadif.so @dirrm %%DATADIR%%/html @dirrm %%DATADIR%%/fonts @dirrmtry %%DATADIR%% +@dirrmtry lib/pkgconfig @dirrm lib/mythtv/filters @dirrmtry lib/mythtv +@dirrm include/mythtv/zeromq @dirrm include/mythtv/upnp @dirrm include/mythtv/mpeg2dec @dirrm include/mythtv/metadata @dirrm include/mythtv/libswscale +@dirrm include/mythtv/libswresample @dirrm include/mythtv/libpostproc +@dirrm include/mythtv/nzmqt @dirrm include/mythtv/libmythui @dirrm include/mythtv/libmythservicecontracts/services @dirrm include/mythtv/libmythservicecontracts/datacontracts @@ -1838,4 +1917,5 @@ lib/mythtv/filters/libyadif.so @dirrm include/mythtv/dvdread @dirrm include/mythtv/dvdnav @dirrm include/mythtv/bluray +@dirrm include/mythtv/QJson @dirrm include/mythtv diff --git a/multimedia/mythtv/Makefile b/multimedia/mythtv/Makefile index 6785b6ffd889..16ae3703e9f9 100644 --- a/multimedia/mythtv/Makefile +++ b/multimedia/mythtv/Makefile @@ -1,13 +1,8 @@ -# -# Ports collection makefile for: mythtv -# Date created: 05 February 2005 -# Whom: Stacey Son <mythdev@son.org> -# Ari Maniatis <ari@ish.com.au> -# +# Created by: Stacey Son <mythdev@son.org>, Ari Maniatis <ari@ish.com.au> # $FreeBSD$ PORTNAME= mythtv -PORTVERSION= 0.25.2 +PORTVERSION= 0.26.0 CATEGORIES= multimedia MASTER_SITES= http://ftp.osuosl.org/pub/mythtv/ \ http://ftp.osuosl.org/pub/mythtv/old_releases/ \ @@ -20,7 +15,8 @@ COMMENT= MythTV is a homebrew PVR project LIB_DEPENDS= mp3lame.0:${PORTSDIR}/audio/lame \ freetype.9:${PORTSDIR}/print/freetype2 \ tag.1:${PORTSDIR}/audio/taglib -BUILD_DEPENDS= v4l_compat>=1.0.20100321:${PORTSDIR}/multimedia/v4l_compat +BUILD_DEPENDS= v4l_compat>=1.0.20100321:${PORTSDIR}/multimedia/v4l_compat \ + yasm:${PORTSDIR}/devel/yasm RUN_DEPENDS= tv_check:${PORTSDIR}/textproc/p5-xmltv \ wget:${PORTSDIR}/ftp/wget @@ -28,6 +24,7 @@ CONFLICTS= mythtv-frontend-[0-9]* ONLY_FOR_ARCHS= i386 amd64 USE_BZIP2= yes +USE_PKGCONFIG= 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 @@ -56,17 +53,22 @@ CONFIGURE_ARGS= --prefix="${PREFIX}" --dvb-path="${LOCALBASE}/include" \ QMAKESPEC?= ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ -OPTIONS= BINDINGS "Perl and Python bindings" on \ - LIRC "Native LIRC Support" off \ - MYSQL_LOCAL "RUN_DEPEND on selected MySQL server" off \ - OPENGL "OpenGL support" on \ - VDPAU "VDPAU support (nvidia only)" off +OPTIONS_DEFINE= BINDINGS LIRC MYSQL OPENGL VDPAU +OPTIONS_DEFAULT= BINDINGS OPENGL +BINDINGS_DESC= Perl and Python bindings .include <bsd.port.options.mk> SUB_FILES= pkg-message -.if defined(WITH_BINDINGS) +# for too old binutils in base +.if ${OSVERSION} < 900033 +BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils +CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin +MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin +.endif + +.if ${PORT_OPTIONS:MBINDINGS} USE_PYTHON= yes INSTALLS_EGGINFO=yes PYDISTUTILS_PKGNAME=MythTV @@ -92,22 +94,22 @@ CONFIGURE_ARGS+=--without-bindings=perl,python PLIST_SUB+= BINDINGS="@comment " .endif -.if defined(WITH_LIRC) +.if ${PORT_OPTIONS:MLIRC} LIB_DEPENDS+= lirc_client.2:${PORTSDIR}/comms/lirc .endif -.if defined(WITH_MYSQL_LOCAL) +.if ${PORT_OPTIONS:MMYSQL} RUN_DEPENDS+= mysqld_safe:${PORTSDIR}/databases/mysql${MYSQL_VER}-server .endif -.if defined(WITH_OPENGL) +.if ${PORT_OPTIONS:MOPENGL} USE_QT4+= opengl CONFIGURE_ARGS+= --enable-opengl-video .else CONFIGURE_ARGS+= --disable-opengl-video .endif -.if defined(WITH_VDPAU) +.if ${PORT_OPTIONS:MVDPAU} LIB_DEPENDS+= vdpau.1:${PORTSDIR}/multimedia/libvdpau CONFIGURE_ARGS+= --enable-vdpau .else diff --git a/multimedia/mythtv/distinfo b/multimedia/mythtv/distinfo index fa432f20bc4a..807401c050fd 100644 --- a/multimedia/mythtv/distinfo +++ b/multimedia/mythtv/distinfo @@ -1,2 +1,2 @@ -SHA256 (mythtv-0.25.2.tar.bz2) = d6b7f1692f30b3dde170d2b755453675de1d222aa8556197e62b8d8617beeac6 -SIZE (mythtv-0.25.2.tar.bz2) = 31838320 +SHA256 (mythtv-0.26.0.tar.bz2) = 2f158962ca3009db563dabc32827c47788a688bd67a25abd76f4baa9c3cfe306 +SIZE (mythtv-0.26.0.tar.bz2) = 40887666 diff --git a/multimedia/mythtv/files/patch-bindings__php__MythBase.php b/multimedia/mythtv/files/patch-bindings__php__MythBase.php deleted file mode 100644 index e291c6dc26f6..000000000000 --- a/multimedia/mythtv/files/patch-bindings__php__MythBase.php +++ /dev/null @@ -1,11 +0,0 @@ ---- bindings/php/MythBase.php.orig 2012-07-16 17:21:00.000000000 +0200 -+++ bindings/php/MythBase.php 2012-07-29 14:13:02.915720097 +0200 -@@ -47,7 +47,7 @@ - - public function __destruct() { - if (!is_null($this->cacheKey)) -- Cache::setObject($this->cacheKey, &$this, $this->cacheLifetime); -+ Cache::setObject($this->cacheKey, $this, $this->cacheLifetime); - $this->cacheKey = null; - } - diff --git a/multimedia/mythtv/files/patch-bindings__python__setup.py b/multimedia/mythtv/files/patch-bindings__python__setup.py index 9cda71b3ab21..66c95ffa184f 100644 --- a/multimedia/mythtv/files/patch-bindings__python__setup.py +++ b/multimedia/mythtv/files/patch-bindings__python__setup.py @@ -5,7 +5,7 @@ setup( name='MythTV', - version='0.25.0', -+ version='0.25.2', ++ version='0.26.0', description='MythTV Python bindings.', long_description='Provides canned database and protocol access to the MythTV database, mythproto, mythxml, and frontend remote control.', packages=['MythTV', 'MythTV/tmdb', 'MythTV/tmdb3', 'MythTV/ttvdb', 'MythTV/wikiscripts'], diff --git a/multimedia/mythtv/files/patch-configure b/multimedia/mythtv/files/patch-configure index df490e145ddd..ec18184b8f97 100644 --- a/multimedia/mythtv/files/patch-configure +++ b/multimedia/mythtv/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2012-03-19 06:39:10.000000000 +0100 -+++ configure 2012-03-21 23:40:37.060067228 +0100 -@@ -734,21 +734,21 @@ +--- configure.orig 2012-10-02 12:30:24.000000000 +0200 ++++ configure 2012-10-03 19:27:16.773415414 +0200 +@@ -731,21 +731,21 @@ log check_cc "$@" cat > $TMPC log_file $TMPC @@ -8,6 +8,14 @@ + check_cmd $cc $CPPFLAGS $CFLAGS -I${prefix}/include "$@" -c -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_cpp(){ log check_cpp "$@" cat > $TMPC @@ -16,16 +24,8 @@ + check_cmd $cc $CPPFLAGS $CFLAGS -I${prefix}/include "$@" -E -o $TMPO $TMPC } - check_cxx(){ - log check_cxx "$@" - cat > $TMPCXX - log_file $TMPCXX -- check_cmd $cxx $CXXPPFLAGS $ECXXFLAGS "$@" -c -o $TMPO $TMPCXX -+ check_cmd $cxx $CXXPPFLAGS $ECXXFLAGS -I${prefix}/include "$@" -c -o $TMPO $TMPCXX - } - check_as(){ -@@ -1942,7 +1942,7 @@ +@@ -2152,7 +2152,7 @@ # machine arch_default=$(uname -m) @@ -34,8 +34,8 @@ processor=`uname -p 2>/dev/null` processor_flags="" tune="generic" -@@ -2920,7 +2920,7 @@ - i686|pentiumpro|pentium[23]|pentium-m|athlon|athlon-tbird|athlon-4|athlon-[mx]p|athlon64|k8|opteron|athlon-fx|k8-sse3|opteron-sse3|athlon64-sse3|core2|amdfam10|barcelona|atom) +@@ -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) cpuflags="-march=$cpu" enable cmov - enable fast_cmov @@ -43,15 +43,15 @@ ;; # targets that do support conditional mov but on which it's slow pentium4|pentium4m|prescott|nocona) -@@ -3120,7 +3120,6 @@ - enable malloc_aligned +@@ -3401,7 +3401,6 @@ + append CCONFIG "freebsd" # Workaround compile errors from missing u_int/uint def CPPFLAGS=`echo $CPPFLAGS | sed 's/-D_POSIX_C_SOURCE=200112//'` - disable ivtv enable backend ;; bsd/os) -@@ -4962,6 +4961,8 @@ +@@ -5427,6 +5426,8 @@ QMAKE_LIBDIR_QT-=${sysroot}${libdir} QMAKE_LIBDIR-=${sysroot}${libdir} LATE_LIBS+=-L${sysroot}${libdir} @@ -60,7 +60,7 @@ EOF #echo "endif # FFMPEG_CONFIG_MAK" >> $TMPMAK -@@ -5012,7 +5013,7 @@ +@@ -5477,7 +5478,7 @@ BINDIR=\$(INSTALL_ROOT)$bindir DATADIR=\$(INSTALL_ROOT)$datadir MANDIR=\$(INSTALL_ROOT)$mandir diff --git a/multimedia/mythtv/files/patch-extern__zeromq__doc__Makefile.in b/multimedia/mythtv/files/patch-extern__zeromq__doc__Makefile.in new file mode 100644 index 000000000000..0630820f8d82 --- /dev/null +++ b/multimedia/mythtv/files/patch-extern__zeromq__doc__Makefile.in @@ -0,0 +1,11 @@ +--- external/zeromq/doc/Makefile.in.orig 2012-10-02 12:30:24.000000000 +0200 ++++ external/zeromq/doc/Makefile.in 2012-10-20 16:56:13.777947694 +0200 +@@ -476,7 +476,7 @@ + + install-info-am: + +-install-man: install-man3 install-man7 ++install-man: + + install-pdf: install-pdf-am + diff --git a/multimedia/mythtv/files/patch-external__FFmpeg__libavcodec__Makefile b/multimedia/mythtv/files/patch-external__FFmpeg__libavcodec__Makefile deleted file mode 100644 index 2f3a9b67c3f1..000000000000 --- a/multimedia/mythtv/files/patch-external__FFmpeg__libavcodec__Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- external/FFmpeg/libavcodec/Makefile.orig 2010-11-01 21:14:42.000000000 +0100 -+++ external/FFmpeg/libavcodec/Makefile 2010-11-01 20:30:35.000000000 +0100 -@@ -631,7 +631,7 @@ - # well. - OBJS-$(!CONFIG_SMALL) += inverse.o - ---include $(SUBDIR)$(ARCH)/Makefile -+-include $(SUBDIR)x86/Makefile - - SKIPHEADERS = %_tablegen.h - SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h diff --git a/multimedia/mythtv/files/patch-programs__mythtranscode__transcode.cpp b/multimedia/mythtv/files/patch-programs__mythtranscode__transcode.cpp deleted file mode 100644 index aab1bde45ded..000000000000 --- a/multimedia/mythtv/files/patch-programs__mythtranscode__transcode.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/mythtranscode/transcode.cpp.orig 2012-03-19 06:39:10.000000000 +0100 -+++ programs/mythtranscode/transcode.cpp 2012-03-24 18:25:25.121052981 +0100 -@@ -484,7 +484,7 @@ - { - return false; - } -- else if (abs(audioFramesToCut - frames) < audioFramesToCut) -+ else if (llabs(audioFramesToCut - frames) < audioFramesToCut) - { - // Drop the packet containing these frames if doing - // so gets us closer to zero left to drop diff --git a/multimedia/mythtv/pkg-plist b/multimedia/mythtv/pkg-plist index 3507c9543272..fb27d6cb3e46 100644 --- a/multimedia/mythtv/pkg-plist +++ b/multimedia/mythtv/pkg-plist @@ -8,6 +8,7 @@ bin/mythfilldatabase bin/mythfrontend bin/mythjobqueue bin/mythlcdserver +bin/mythlogserver bin/mythmediaserver bin/mythmetadatalookup bin/mythpreviewgen @@ -19,10 +20,20 @@ bin/mythtv-setup bin/mythutil bin/mythwelcome %%BINDINGS%%bin/mythwikiscripts +include/mythtv/QJson/Parser +include/mythtv/QJson/QObjectHelper +include/mythtv/QJson/Serializer +include/mythtv/QJson/parser.h +include/mythtv/QJson/parserrunnable.h +include/mythtv/QJson/qjson_export.h +include/mythtv/QJson/qobjecthelper.h +include/mythtv/QJson/serializer.h +include/mythtv/QJson/serializerrunnable.h include/mythtv/audiooutput.h include/mythtv/audiooutputsettings.h include/mythtv/audiosettings.h include/mythtv/autodeletedeque.h +include/mythtv/bswap.h include/mythtv/bluray/attributes.h include/mythtv/bluray/bdparse.h include/mythtv/bluray/bits.h @@ -62,6 +73,7 @@ include/mythtv/dvdread/nav_read.h include/mythtv/dvdread/nav_types.h include/mythtv/eldutils.h include/mythtv/exitcodes.h +include/mythtv/ffmpeg-mmx.h include/mythtv/filesysteminfo.h include/mythtv/hardwareprofile.h include/mythtv/httpcomms.h @@ -69,38 +81,50 @@ 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/mmx.h -include/mythtv/libavcodec/opt.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/libavfilter/asrc_abuffer.h +include/mythtv/libavfilter/avcodec.h include/mythtv/libavfilter/avfilter.h 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 include/mythtv/libavutil/adler32.h +include/mythtv/libavutil/aes.h include/mythtv/libavutil/attributes.h +include/mythtv/libavutil/audio_fifo.h include/mythtv/libavutil/audioconvert.h include/mythtv/libavutil/avassert.h include/mythtv/libavutil/avconfig.h include/mythtv/libavutil/avstring.h include/mythtv/libavutil/avutil.h include/mythtv/libavutil/base64.h +include/mythtv/libavutil/bprint.h include/mythtv/libavutil/bswap.h include/mythtv/libavutil/common.h include/mythtv/libavutil/cpu.h include/mythtv/libavutil/crc.h +include/mythtv/libavutil/dict.h include/mythtv/libavutil/error.h include/mythtv/libavutil/eval.h include/mythtv/libavutil/fifo.h include/mythtv/libavutil/file.h include/mythtv/libavutil/imgutils.h include/mythtv/libavutil/intfloat_readwrite.h +include/mythtv/libavutil/intfloat.h include/mythtv/libavutil/intreadwrite.h include/mythtv/libavutil/lfg.h include/mythtv/libavutil/log.h @@ -115,7 +139,9 @@ include/mythtv/libavutil/pixfmt.h include/mythtv/libavutil/random_seed.h include/mythtv/libavutil/rational.h include/mythtv/libavutil/samplefmt.h -include/mythtv/libavutil/sha1.h +include/mythtv/libavutil/sha.h +include/mythtv/libavutil/timecode.h +include/mythtv/libavutil/timestamp.h include/mythtv/libmyth/audiooutput.h include/mythtv/libmyth/audiooutputsettings.h include/mythtv/libmyth/audiosettings.h @@ -154,15 +180,18 @@ include/mythtv/libmyth/volumebase.h include/mythtv/libmyth/xmlparse.h include/mythtv/libmythbase/autodeletedeque.h include/mythtv/libmythbase/bonjourregister.h +include/mythtv/libmythbase/bswap.h include/mythtv/libmythbase/compat.h include/mythtv/libmythbase/dbutil.h 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 @@ -174,6 +203,7 @@ include/mythtv/libmythbase/mythconfig.h include/mythtv/libmythbase/mythconfig.mak include/mythtv/libmythbase/mythcorecontext.h include/mythtv/libmythbase/mythcoreutil.h +include/mythtv/libmythbase/mythdate.h include/mythtv/libmythbase/mythdb.h include/mythtv/libmythbase/mythdbcon.h include/mythtv/libmythbase/mythdbparams.h @@ -187,6 +217,7 @@ 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/mythsocket.h include/mythtv/libmythbase/mythsocket_cb.h include/mythtv/libmythbase/mythstorage.h @@ -291,6 +322,7 @@ include/mythtv/libmythui/themeinfo.h include/mythtv/libmythui/x11colors.h include/mythtv/libmythui/xmlparsebase.h include/mythtv/libpostproc/postprocess.h +include/mythtv/libswresample/swresample.h include/mythtv/libswscale/swscale.h include/mythtv/mcodecs.h include/mythtv/metadata/bluraymetadata.h @@ -327,6 +359,7 @@ include/mythtv/mythconfiggroups.h include/mythtv/mythcontext.h include/mythtv/mythcorecontext.h include/mythtv/mythcoreutil.h +include/mythtv/mythdate.h include/mythtv/mythdb.h include/mythtv/mythdbcon.h include/mythtv/mythdbparams.h @@ -359,6 +392,7 @@ include/mythtv/mythwidgets.h include/mythtv/mythwizard.h include/mythtv/netgrabbermanager.h include/mythtv/netutils.h +include/mythtv/nzmqt/nzmqt.hpp include/mythtv/oldsettings.h include/mythtv/output.h include/mythtv/playgroup.h @@ -374,6 +408,7 @@ include/mythtv/samplerate.h include/mythtv/schemawizard.h include/mythtv/serverpool.h include/mythtv/settings.h +include/mythtv/signalhandling.h include/mythtv/storagegroup.h include/mythtv/storagegroupeditor.h include/mythtv/uitypes.h @@ -413,6 +448,9 @@ include/mythtv/virtualkeyboard_qt.h include/mythtv/visual.h include/mythtv/volumebase.h include/mythtv/xmlparse.h +include/mythtv/zeromq/zmq.h +include/mythtv/zeromq/zmq.hpp +include/mythtv/zeromq/zmq_utils.h %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/__init__.py %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/__init__.pyc %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/_conn_mysqldb.py @@ -489,80 +527,109 @@ include/mythtv/xmlparse.h %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/ttvdb/tvdb_exceptions.py %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/ttvdb/tvdb_exceptions.pyc %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/ttvdb/tvdb_ui.py +%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/utility/__init__.py +%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/utility/__init__.pyc +%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/utility/altdict.py +%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/utility/altdict.pyc +%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/utility/dequebuffer.py +%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/utility/dequebuffer.pyc +%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/utility/dt.py +%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/utility/dt.pyc +%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/utility/enum.py +%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/utility/enum.pyc +%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/utility/mixin.py +%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/utility/mixin.pyc +%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/utility/other.py +%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/utility/other.pyc +%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/utility/singleton.py +%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/utility/singleton.pyc %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/ttvdb/tvdb_ui.pyc -%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/utility.py -%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/utility.pyc %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/wikiscripts/__init__.py %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/wikiscripts/__init__.pyc %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/wikiscripts/wikiscripts.py %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/wikiscripts/wikiscripts.pyc -lib/libmyth-0.25.so -lib/libmyth-0.25.so.0 -lib/libmyth-0.25.so.0.25 -lib/libmyth-0.25.so.0.25.0 +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/libmythavcodec.so -lib/libmythavcodec.so.52 -lib/libmythavcodec.so.52.113.1 +lib/libmythavcodec.so.54 +lib/libmythavcodec.so.54.23.100 lib/libmythavdevice.so -lib/libmythavdevice.so.52 -lib/libmythavdevice.so.52.2.3 +lib/libmythavdevice.so.54 +lib/libmythavdevice.so.54.0.100 lib/libmythavfilter.so -lib/libmythavfilter.so.1 -lib/libmythavfilter.so.1.76.0 +lib/libmythavfilter.so.2 +lib/libmythavfilter.so.2.77.100 lib/libmythavformat.so -lib/libmythavformat.so.52 -lib/libmythavformat.so.52.101.0 +lib/libmythavformat.so.54 +lib/libmythavformat.so.54.6.101 lib/libmythavutil.so -lib/libmythavutil.so.50 -lib/libmythavutil.so.50.39.0 -lib/libmythbase-0.25.so -lib/libmythbase-0.25.so.0 -lib/libmythbase-0.25.so.0.25 -lib/libmythbase-0.25.so.0.25.0 -lib/libmythbluray-0.25.a -lib/libmythdvdnav-0.25.a -lib/libmythfreemheg-0.25.so -lib/libmythfreemheg-0.25.so.0 -lib/libmythfreemheg-0.25.so.0.25 -lib/libmythfreemheg-0.25.so.0.25.0 -lib/libmythhdhomerun-0.25.so -lib/libmythhdhomerun-0.25.so.0 -lib/libmythhdhomerun-0.25.so.0.25 -lib/libmythhdhomerun-0.25.so.0.25.0 -lib/libmythlivemedia-0.25.so -lib/libmythlivemedia-0.25.so.0 -lib/libmythlivemedia-0.25.so.0.25 -lib/libmythlivemedia-0.25.so.0.25.0 -lib/libmythmetadata-0.25.so -lib/libmythmetadata-0.25.so.0 -lib/libmythmetadata-0.25.so.0.25 -lib/libmythmetadata-0.25.so.0.25.0 +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/libmythnzmqt.so +lib/libmythnzmqt.so.0 +lib/libmythnzmqt.so.0.26 +lib/libmythnzmqt.so.0.26.0 lib/libmythpostproc.so -lib/libmythpostproc.so.51 -lib/libmythpostproc.so.51.2.0 -lib/libmythprotoserver-0.25.so -lib/libmythprotoserver-0.25.so.0 -lib/libmythprotoserver-0.25.so.0.25 -lib/libmythprotoserver-0.25.so.0.25.0 -lib/libmythservicecontracts-0.25.so -lib/libmythservicecontracts-0.25.so.0 -lib/libmythservicecontracts-0.25.so.0.25 -lib/libmythservicecontracts-0.25.so.0.25.0 +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/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/libmythswresample.so +lib/libmythswresample.so.0 +lib/libmythswresample.so.0.15.100 lib/libmythswscale.so -lib/libmythswscale.so.0 -lib/libmythswscale.so.0.12.0 -lib/libmythtv-0.25.so -lib/libmythtv-0.25.so.0 -lib/libmythtv-0.25.so.0.25 -lib/libmythtv-0.25.so.0.25.0 -lib/libmythui-0.25.so -lib/libmythui-0.25.so.0 -lib/libmythui-0.25.so.0.25 -lib/libmythui-0.25.so.0.25.0 -lib/libmythupnp-0.25.so -lib/libmythupnp-0.25.so.0 -lib/libmythupnp-0.25.so.0.25 -lib/libmythupnp-0.25.so.0.25.0 +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/libmythzmq.a +lib/libmythzmq.la +lib/libmythzmq.so +lib/libmythzmq.so.1 lib/mythtv/filters/libadjust.so lib/mythtv/filters/libbobdeint.so lib/mythtv/filters/libcrop.so @@ -577,7 +644,9 @@ lib/mythtv/filters/liblinearblend.so lib/mythtv/filters/libonefield.so lib/mythtv/filters/libpostprocess.so lib/mythtv/filters/libquickdnr.so +lib/mythtv/filters/libvflip.so lib/mythtv/filters/libyadif.so +lib/pkgconfig/libmythzmq.pc %%DATADIR%%/CDS_scpd.xml %%DATADIR%%/CMGR_scpd.xml %%DATADIR%%/MFEXML_scpd.xml @@ -596,13 +665,35 @@ lib/mythtv/filters/libyadif.so %%DATADIR%%/database/mc.sql %%DATADIR%%/devicemaster.xml %%DATADIR%%/deviceslave.xml +%%DATADIR%%/fonts/DroidSans-Bold.ttf +%%DATADIR%%/fonts/DroidSans.ttf +%%DATADIR%%/fonts/DroidSansMono.ttf +%%DATADIR%%/fonts/DroidSerif-Bold.ttf +%%DATADIR%%/fonts/DroidSerif-BoldItalic.ttf +%%DATADIR%%/fonts/DroidSerif-Italic.ttf +%%DATADIR%%/fonts/DroidSerif-Regular.ttf %%DATADIR%%/fonts/FreeMono.ttf +%%DATADIR%%/fonts/FreeMonoBold.ttf +%%DATADIR%%/fonts/FreeMonoBoldOblique.ttf +%%DATADIR%%/fonts/FreeMonoOblique.ttf %%DATADIR%%/fonts/FreeSans.ttf %%DATADIR%%/fonts/FreeSansBold.ttf +%%DATADIR%%/fonts/FreeSansBoldOblique.ttf +%%DATADIR%%/fonts/FreeSansOblique.ttf +%%DATADIR%%/fonts/FreeSerif.ttf +%%DATADIR%%/fonts/FreeSerifBold.ttf +%%DATADIR%%/fonts/FreeSerifBoldItalic.ttf +%%DATADIR%%/fonts/FreeSerifItalic.ttf +%%DATADIR%%/fonts/Purisa.ttf +%%DATADIR%%/fonts/README-TeX-Gyre-Chorus.txt +%%DATADIR%%/fonts/README-droid.txt +%%DATADIR%%/fonts/README-freefont-20120503.txt +%%DATADIR%%/fonts/README-purisa.txt %%DATADIR%%/fonts/Tiresias Infofont Bold.ttf %%DATADIR%%/fonts/Tiresias Infofont Italic.ttf %%DATADIR%%/fonts/Tiresias Infofont.ttf %%DATADIR%%/fonts/tiresias_gpl3.txt +%%DATADIR%%/fonts/texgyrechorus-mediumitalic.otf %%DATADIR%%/hardwareprofile/.gitignore %%DATADIR%%/hardwareprofile/MultipartPostHandler.py %%DATADIR%%/hardwareprofile/__init__.py @@ -978,6 +1069,7 @@ lib/mythtv/filters/libyadif.so %%DATADIR%%/locales/nb_no.xml %%DATADIR%%/locales/ru_ru.xml %%DATADIR%%/locales/zh_hk.xml +%%DATADIR%%/locales/zh_tw.xml %%DATADIR%%/metadata/Movie/tmdb.py %%DATADIR%%/metadata/Movie/tmdb3.py %%DATADIR%%/metadata/Television/ttvdb.py @@ -1002,9 +1094,6 @@ lib/mythtv/filters/libyadif.so %%DATADIR%%/themes/MythCenter-wide/base.xml %%DATADIR%%/themes/MythCenter-wide/config-ui.xml %%DATADIR%%/themes/MythCenter-wide/controls-ui.xml -%%DATADIR%%/themes/MythCenter-wide/fonts/DroidSans.ttf -%%DATADIR%%/themes/MythCenter-wide/fonts/DroidSans-Bold.ttf -%%DATADIR%%/themes/MythCenter-wide/fonts/LICENSE %%DATADIR%%/themes/MythCenter-wide/htmls/progdetails_page1.html %%DATADIR%%/themes/MythCenter-wide/htmls/progdetails_page2.html %%DATADIR%%/themes/MythCenter-wide/keyboard/keyboard.xml @@ -1933,6 +2022,7 @@ lib/mythtv/filters/libyadif.so %%DATADIR%%/themes/default/mythfilebrowser-background.png %%DATADIR%%/themes/default/mythprogressdialog-background.png %%DATADIR%%/themes/default/osd.xml +%%DATADIR%%/themes/default/osd_subtitle.xml %%DATADIR%%/themes/default/pd-background.png %%DATADIR%%/themes/default/pf-background.png %%DATADIR%%/themes/default/pf-lines.png @@ -2088,7 +2178,6 @@ lib/mythtv/filters/libyadif.so @dirrm %%DATADIR%%/themes/MythCenter-wide/osd @dirrm %%DATADIR%%/themes/MythCenter-wide/keyboard @dirrm %%DATADIR%%/themes/MythCenter-wide/htmls -@dirrm %%DATADIR%%/themes/MythCenter-wide/fonts @dirrm %%DATADIR%%/themes/MythCenter-wide @dirrm %%DATADIR%%/themes/MythCenter @dirrm %%DATADIR%%/themes/DVR @@ -2150,20 +2239,25 @@ lib/mythtv/filters/libyadif.so @dirrm %%DATADIR%%/bindings @dirrm %%DATADIR%%/backend-config @dirrmtry %%DATADIR%% +@dirrmtry lib/pkgconfig @dirrm lib/mythtv/filters @dirrmtry lib/mythtv %%BINDINGS%%@dirrm %%PYTHON_SITELIBDIR%%/MythTV/wikiscripts +%%BINDINGS%%@dirrm %%PYTHON_SITELIBDIR%%/MythTV/utility %%BINDINGS%%@dirrm %%PYTHON_SITELIBDIR%%/MythTV/ttvdb/XSLT %%BINDINGS%%@dirrm %%PYTHON_SITELIBDIR%%/MythTV/ttvdb %%BINDINGS%%@dirrm %%PYTHON_SITELIBDIR%%/MythTV/tmdb3 %%BINDINGS%%@dirrm %%PYTHON_SITELIBDIR%%/MythTV/tmdb/XSLT %%BINDINGS%%@dirrm %%PYTHON_SITELIBDIR%%/MythTV/tmdb %%BINDINGS%%@dirrm %%PYTHON_SITELIBDIR%%/MythTV +@dirrm include/mythtv/zeromq @dirrm include/mythtv/upnp @dirrm include/mythtv/mpeg2dec @dirrm include/mythtv/metadata @dirrm include/mythtv/libswscale +@dirrm include/mythtv/libswresample @dirrm include/mythtv/libpostproc +@dirrm include/mythtv/nzmqt @dirrm include/mythtv/libmythui @dirrm include/mythtv/libmythservicecontracts/services @dirrm include/mythtv/libmythservicecontracts/datacontracts @@ -2178,4 +2272,5 @@ lib/mythtv/filters/libyadif.so @dirrm include/mythtv/dvdread @dirrm include/mythtv/dvdnav @dirrm include/mythtv/bluray +@dirrm include/mythtv/QJson @dirrm include/mythtv diff --git a/www/mythplugin-mythweb/Makefile b/www/mythplugin-mythweb/Makefile index 7dbe3a85618b..89756b25915a 100644 --- a/www/mythplugin-mythweb/Makefile +++ b/www/mythplugin-mythweb/Makefile @@ -1,12 +1,8 @@ -# New ports collection makefile for: mythplugin-mythweb -# Date created: 2009-12-27 -# Whom: Bernhard Froehlich <decke@bluelife.at> -# +# Created by: Bernhard Froehlich <decke@bluelife.at> # $FreeBSD$ -# PORTNAME= mythweb -PORTVERSION= 0.25.2 +PORTVERSION= 0.26.0 CATEGORIES= www MASTER_SITES= http://ftp.osuosl.org/pub/mythtv/ \ http://ftp.osuosl.org/pub/mythtv/old_releases/ \ @@ -26,16 +22,16 @@ USE_PHP= spl session mysql pcre posix json SUB_FILES= pkg-message REINPLACE_ARGS= -i "" -OPTIONS= APACHE "Enable Apache Support" on \ - LIGHTTPD "Enable Lighttpd Support" off +OPTIONS_DEFINE= APACHE LIGHTTPD +OPTIONS_DEFAULT= APACHE .include <bsd.port.options.mk> -.if defined(WITH_APACHE) +.if ${PORT_OPTIONS:MAPACHE} USE_APACHE_RUN= 22+ .endif -.if defined(WITH_LIGHTTPD) +.if ${PORT_OPTIONS:MLIGHTTPD} RUN_DEPENDS+= lighttpd:${PORTSDIR}/www/lighttpd .endif diff --git a/www/mythplugin-mythweb/distinfo b/www/mythplugin-mythweb/distinfo index f909e59ab41f..a7c45c312967 100644 --- a/www/mythplugin-mythweb/distinfo +++ b/www/mythplugin-mythweb/distinfo @@ -1,2 +1,2 @@ -SHA256 (mythplugins-0.25.2.tar.bz2) = e8507dcddfbb63ab50fe738400639c20bf2f2a278a8947fa85d9096e537f11f3 -SIZE (mythplugins-0.25.2.tar.bz2) = 36763594 +SHA256 (mythplugins-0.26.0.tar.bz2) = 4e7f0493f37792c084c1b4d0b5863b4201ebce6d62ab7c6cc31ca74087d83c62 +SIZE (mythplugins-0.26.0.tar.bz2) = 36673620 diff --git a/www/mythplugin-mythweb/files/patch-mythweb__includes__sorting.php b/www/mythplugin-mythweb/files/patch-mythweb__includes__sorting.php deleted file mode 100644 index 6b8761107a7c..000000000000 --- a/www/mythplugin-mythweb/files/patch-mythweb__includes__sorting.php +++ /dev/null @@ -1,11 +0,0 @@ ---- mythweb/includes/sorting.php.orig 2012-05-30 23:22:20.000000000 +0200 -+++ mythweb/includes/sorting.php 2012-07-29 14:17:07.402674096 +0200 -@@ -119,7 +119,7 @@ - function by_user_choice(&$a, &$b) { - foreach ($GLOBALS['user_sort_choice'] as $sort) { - $function = 'by_'.$sort['field']; -- $response = $function(&$a, &$b); -+ $response = $function($a, $b); - // Identical response, go on to the next sort choice - if (!$response) - continue; |