Attachment #182780 for bug #219149




# $FreeBSD$

PORTNAME=	mythtv
PORTVERSION=	0.28.1
CATEGORIES=	multimedia

MAINTAINER=	ports@FreeBSD.org

		libudf.so:sysutils/libcdio \
		libva.so:multimedia/libva \
		libass.so:multimedia/libass \
		libfftw3f.so:math/fftw3-float \
		libfftw3_threads.so:math/fftw3 \
		libexiv2.so:graphics/exiv2 \
		libsndio.so:audio/sndio \
		libGL.so:graphics/mesa-libs

BUILD_DEPENDS=	v4l_compat>=1.0.20100321:multimedia/v4l_compat \
		yasm:devel/yasm
RUN_DEPENDS=	tv_check:textproc/p5-xmltv \


USE_GITHUB=	yes
GH_ACCOUNT=	MythTV
GH_TAGNAME=	03f4403

WRKSRC_SUBDIR=	${PORTNAME}


USES=		gmake iconv libtool perl5 pkgconfig pathfix shebangfix ssl
SHEBANG_FILES=	programs/scripts/database/mythconverg_backup.pl \
		programs/scripts/database/mythconverg_restore.pl
#USE_QT4=	corelib dbus declarative gui sql network script linguist_build l10n sql-mysql_run \
		moc_build qmake_build rcc_build uic_build imageformats webkit xml
USE_QT5=	core declarative dbus gui l10n qmake sql sql_mysql_run network script widgets webkit xml

USE_GL=		gl
USE_XORG=	x11 xcb xext xinerama xrandr xv xxf86vm
QT_NONSTANDARD=	yes
HAS_CONFIGURE=	yes
USE_LDCONFIG=	${PREFIX}/lib/mythtv/filters

USERS=		mythtv
GROUPS=		mythtv

MAKE_ENV=	QTDIR="${PREFIX}" \
		QMAKESPEC="${QMAKESPEC}"

CPPFLAGS+=	${QTCPPFLAGS}
CONFIGURE_ENV+=	QMAKESPEC="${QMAKESPEC}" MOC="${MOC}" \
		QTDIR="${PREFIX}"
CONFIGURE_ENV+=	PKG_CONFIG_PATH="${LOCALBASE}/libdata/pkgconfig"
LDFLAGS+=	-L${LOCALBASE}/lib

CONFIGURE_ARGS=	--prefix="${PREFIX}" --cc="${CC}" --cxx="${CXX}" --dvb-path="${LOCALBASE}/include/libdvbv5" \
		--libxml2-path="${LOCALBASE}/include/libxml2" --enable-v4l2 --enable-ivtv --enable-xv \
		--disable-audio-alsa --disable-indev=alsa --disable-outdev=alsa --disable-mythlogserver --qmake=${QMAKE}

QMAKESPECS?=	${LOCALBASE}/lib/qt5/mkspecs/freebsd-g++

OPTIONS_DEFINE=	BINDINGS LIRC MYSQL OPENGL VDPAU
OPTIONS_DEFAULT=	BINDINGS OPENGL VDPAU

VDPAU_CONFIGURE_ENABLE=	vdpau

OPENGL_CONFIGURE_ENABLE=	opengl-video
OPENGL_USE=	QT5=opengl

SED_CMD=	/usr/bin/sed

.include <bsd.port.options.mk>

SUB_FILES=	pkg-message

		${WRKSRC}/configure \
		${WRKSRC}/libs/libmythtv/libmythtv.pro \
		${WRKSRC}/bindings/perl/MythTV/Recording.pm \
		${WRKSRC}/programs/mythtranscode/external/replex/Makefile.standalone \
		${WRKSRC}/programs/scripts/database/mythconverg_backup.pl \
		${WRKSRC}/programs/scripts/database/mythconverg_restore.pl \
		${WRKSRC}/programs/mythcommflag/mythcommflag-analyze

post-install:
	@${MKDIR} ${STAGEDIR}${PREFIX}/share/mythtv/database
	@${CP} ${WRKSRC}/database/mc.sql ${STAGEDIR}${PREFIX}/share/mythtv/database
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mythtv/filters/*.so

.for filename in mythutil mythffmpeg mythfilldatabase mythfilerecorder mythccextractor \
	mythlcdserver mythfrontend mythpreviewgen mythjobqueue mythbackend \
	mythffprobe mythmetadatalookup mythtranscode mythcommflag mythffserver \
	mythavtest mythmediaserver mythhdhomerun_config mythtv-setup \
	mythreplex mythwelcome mythshutdown mythscreenwizard
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${filename}
.endfor

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1484727010	1	TIMESTAMP = 1495384962
2	SHA256 (MythTV-mythtv-0.28.7-ad97d24_GH0.tar.gz) = 9e3b0782e7627fdbb91641ac39e2c39d3fc01ee1a57152c74df9c9116e966238	2	SHA256 (MythTV-mythtv-0.28.1-03f4403_GH0.tar.gz) = fa2e8d3dd18495ea71c9b60657e84fcea1013118ca0190241b4e220fc1c33c73
3	SIZE (MythTV-mythtv-0.28.7-ad97d24_GH0.tar.gz) = 85651303	3	SIZE (MythTV-mythtv-0.28.1-03f4403_GH0.tar.gz) = 104461043




--- configure.orig	2017-02-01 09:49:25 UTC
+++ configure
@@ -979,35 +979,35 @@ check_cc(){
     log check_cc "$@"
     cat > $TMPC
     log_file $TMPC

+    check_cmd $cxx $CPPFLAGS $CXXFLAGS $ECXXFLAGS -I${prefix}/include "$@" $CXX_C -o $TMPO $TMPCPP
 }
 
 check_objcc(){
     log check_objcc "$@"
     cat > $TMPM
     log_file $TMPM
-    check_cmd $objcc -Werror=missing-prototypes $CPPFLAGS $CFLAGS $OBJCFLAGS "$@" $OBJCC_C $(cc_o $TMPO) $TMPM
+    check_cmd $objcc -Werror=missing-prototypes $CPPFLAGS $CFLAGS $OBJCFLAGS -I${prefix}/include  "$@" $OBJCC_C $(cc_o $TMPO) $TMPM
 }
 
 check_cpp(){
     log check_cpp "$@"
     cat > $TMPC
     log_file $TMPC
-    check_cmd $cc $CPPFLAGS $CFLAGS "$@" $(cc_e $TMPO) $TMPC
+    check_cmd $cc $CPPFLAGS $CFLAGS -I${prefix}/include  "$@" $(cc_e $TMPO) $TMPC
 }
 
 as_o(){
@@ -3364,7 +3364,7 @@ vbox_deps="backend"
 ceton_deps="backend"
 mpegtsraw_demuxer_deps="merge_libavformat_mpegts_c"
 mythtranscode_deps="backend frontend"
-opengl_deps_any="agl_h GL_gl_h EGL_egl_h GLES2_gl2_h darwin windows x11"
+opengl_deps_any="agl_h $GL_gl_h EGL_egl_h GLES2_gl2_h darwin windows x11"
 opengles_deps="GLES2_gl2_h"
 opengl_video_deps="opengl"
 opengl_themepainter_deps="opengl"
@@ -6615,7 +6615,7 @@ if enabled taglib; then
         taglibs=`taglib-config --libs`
     fi
 
-    if test $taglib_minor -lt 7 || ! check_class_headers_cpp "taglib/fileref.h stdlib.h" TagLib::FileRef $tagincludes $taglibs -lstdc++; then
+    if test $taglib_minor -lt 10 || ! check_class_headers_cpp "/usr/local/include/taglib/fileref.h stdlib.h" TagLib::FileRef $tagincludes $taglibs -lstdc++; then
         die "ERROR: cannot find taglib 1.7 or later."
     fi
 fi
 processor_flags=""
 tune="generic"
@@ -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
+            disable fast_cmov
         ;;
         # targets that do support conditional mov but on which it's slow
         pentium4|pentium4m|prescott|nocona)
@@ -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//'`
-        disable ivtv
         enable backend
         ;;
     bsd/os)
@@ -6383,6 +6382,7 @@
 QMAKE_LIBDIR_QT-=${sysroot}${libdir}
 QMAKE_LIBDIR-=${sysroot}${libdir}
 LATE_LIBS+=-L${sysroot}${libdir}
+FREETYPE_CFLAGS-= -I/usr/local/include
 EOF
 
 #echo "endif # FFMPEG_CONFIG_MAK" >> $TMPMAK
@@ -6435,7 +6435,7 @@
 BINDIR=\$(INSTALL_ROOT)$bindir
 DATADIR=\$(INSTALL_ROOT)$datadir
 MANDIR=\$(INSTALL_ROOT)$mandir
-CFLAGS=${CFLAGS} -w
+CFLAGS=${CFLAGS} -I/usr/local/include -w
 endif # FFMPEG_CONFIG_MAK
 EOF
 




--- external/FFmpeg/configure.orig	2017-02-01 09:49:25 UTC
+++ external/FFmpeg/configure
@@ -4234,7 +4234,7 @@ elif enabled mips; then
             enable simd_align_16
             enable fast_64bit
             enable fast_clz
-            enable fast_cmov
+            disable fast_cmov
             enable fast_unaligned
             disable aligned_stack
             case $cpu in
@@ -4357,7 +4357,7 @@ elif enabled x86; then
         |core*|atom|bonnell|nehalem|westmere|silvermont|sandybridge|ivybridge|haswell|broadwell|amdfam10|barcelona|b[dt]ver*)
@@ -2108,7 +2108,7 @@
         i686|pentiumpro|pentium[23]|pentium-m|athlon|athlon-tbird|athlon-4|athlon-[mx]p|athlon64|k8|opteron|athlon-fx|core2|amdfam10|barcelona)
             cpuflags="-march=$cpu"
             enable i686
-            enable fast_cmov
+            disable fast_cmov
         ;;
         # targets that do support conditional mov but on which it's slow
         pentium4|pentium4m|prescott|nocona)
@@ -4458,7 +4458,7 @@ enabled spic && enable_weak pic
 case $target_os in
     aix)
         SHFLAGS=-shared
-        add_cppflags '-I\$(SRC_PATH)/compat/aix'
+        add_cppflags '-I\$(sRC_PATH)/compat/aix'
         enabled shared && add_ldflags -Wl,-brtl
         ;;
     android)
@@ -6285,19 +6285,15 @@ DATADIR=\$(DESTDIR)$datadir
 DOCDIR=\$(DESTDIR)$docdir
 MANDIR=\$(DESTDIR)$mandir
 PKGCONFIGDIR=\$(DESTDIR)$pkgconfigdir
-SRC_PATH=$source_path
 SRC_LINK=$source_link
 ifndef MAIN_MAKEFILE
 SRC_PATH:=\$(SRC_PATH:.%=..%)
 endif
-CC_IDENT=$cc_ident
 ARCH=$arch
 INTRINSICS=$intrinsics
-CC=$cc
-CXX=$cxx
-AS=$as
 OBJCC=$objcc
 LD=$ld
+FFMPEG=$arch
 DEPCC=$dep_cc
 DEPCCFLAGS=$DEPCCFLAGS \$(CPPFLAGS)
 DEPAS=$as

Lines 1-8 Link Here

(-)files/patch-external__FFmpeg__libavcodec__x86__ac3dsp_init.c (-5 / +5 lines)
1	--- external/FFmpeg/libavcodec/x86/ac3dsp_init.c.orig 2013-09-18 20:06:08.000000000 +0000	1	--- external/FFmpeg/libavcodec/x86/ac3dsp_init.c.orig 2017-02-01 09:49:25 UTC
2	+++ external/FFmpeg/libavcodec/x86/ac3dsp_init.c 2013-10-18 11:58:01.000000000 +0000	2	+++ external/FFmpeg/libavcodec/x86/ac3dsp_init.c
3	@@ -51,7 +51,7 @@	3	@@ -63,7 +63,7 @@ void ff_apply_window_int16_ssse3(int16_t
4	extern void ff_ac3_extract_exponents_sse2 (uint8_t exp, int32_t coef, int nb_coefs);	4	void ff_apply_window_int16_ssse3_atom(int16_t output, const int16_t input,
5	extern void ff_ac3_extract_exponents_ssse3(uint8_t exp, int32_t coef, int nb_coefs);	5	const int16_t *window, unsigned int len);
6		6
7	-#if ARCH_X86_32 && defined(__INTEL_COMPILER)	7	-#if ARCH_X86_32 && defined(__INTEL_COMPILER)
8	+#if ARCH_X86_32 && (defined(__INTEL_COMPILER) \|\| defined(__clang__))	8	+#if ARCH_X86_32 && (defined(__INTEL_COMPILER) \|\| defined(__clang__))

Line 0 Link Here

(-)files/patch-external__libmythdvdnav_libdvdnav_highlight_c (+10 lines)
	1	--- external/libmythdvdnav/dvdnav/highlight.c.orig 2017-05-14 21:46:57 UTC
	2	+++ external/libmythdvdnav/dvdnav/highlight.c
	3	@@ -29,6 +29,7 @@
	4	#include <limits.h>
	5	#include <string.h>
	6	#include <sys/time.h>
	7	+#include "dvdnav/dvd_types.h"
	8	#include <dvdread/nav_types.h>
	9	#include "dvdnav/dvdnav.h"
	10	#include "vm/decoder.h"

Lines 1-5 Link Here

(-)files/patch-external__zeromq__src__Makefile.am (-2 / +2 lines)
1	--- external/zeromq/src/Makefile.am.orig 2015-11-16 14:31:23.735432710 +0000	1	--- external/zeromq/src/Makefile.am.orig 2017-02-01 09:49:25 UTC
2	+++ external/zeromq/src/Makefile.am 2015-11-16 14:28:48.465433398 +0000	2	+++ external/zeromq/src/Makefile.am
3	@@ -1,6 +1,6 @@	3	@@ -1,6 +1,6 @@
4	lib_LTLIBRARIES = libmythzmq.la	4	lib_LTLIBRARIES = libmythzmq.la
5		5

Lines 1-7 Link Here

(-)files/patch-libs__libmyth__remoteutil.h (-5 / +4 lines)
1	--- libs/libmyth/remoteutil.h.orig 2013-09-18 16:06:08.000000000 -0400	1	--- libs/libmyth/remoteutil.h.orig 2017-02-01 09:49:25 UTC
2	+++ libs/libmyth/remoteutil.h 2014-01-22 08:26:34.000000000 -0500	2	+++ libs/libmyth/remoteutil.h
3	@@ -8,6 +8,7 @@	3	@@ -10,6 +10,7 @@
4	using namespace std;	4	using std::vector;
5		5
6	#include "mythexp.h"	6	#include "mythexp.h"
7	+#include <sys/types.h>	7	+#include <sys/types.h>
Lines 8-11 Link Here
8		8
9	class ProgramInfo;	9	class ProgramInfo;
10	class MythEvent;	10	class MythEvent;
11

Lines 1-11 Link Here

(-)files/patch-libs__libmythdvdnav__dvdnav__dvdnav.c (-11 lines)
1	--- libs/libmythdvdnav/dvdnav/dvdnav.c.orig 2012-03-18 12:13:45.805789048 +0100
2	+++ libs/libmythdvdnav/dvdnav/dvdnav.c 2012-03-18 12:12:47.166812027 +0100
3	@@ -33,7 +33,7 @@
4	#include <limits.h>
5	#include <string.h>
6	#include <sys/time.h>
7	-#include "dvdnav/dvdnav.h"
8	+#include "dvdnav.h"
9	#include <dvdread/dvd_reader.h>
10	#include <dvdread/nav_types.h>
11	#include <dvdread/ifo_types.h> /* For vm_cmd_t */

Lines 1-6 Link Here

(-)files/patch-libs__libmythtv__videoout_vdpau.cpp (-3 / +3 lines)
1	--- libs/libmythtv/videoout_vdpau.cpp.orig 2010-02-27 06:58:11.000000000 +0100	1	--- libs/libmythtv/videoout_vdpau.cpp.orig 2017-02-01 09:49:25 UTC
2	+++ libs/libmythtv/videoout_vdpau.cpp 2010-04-06 17:40:50.000000000 +0200	2	+++ libs/libmythtv/videoout_vdpau.cpp
3	@@ -395,7 +395,7 @@	3	@@ -436,7 +436,7 @@ void VideoOutputVDPAU::PrepareFrame(Vide
4	if (frame)	4	if (frame)
5	{	5	{
6	// FIXME for 0.23. This should be triggered from AFD by a seek	6	// FIXME for 0.23. This should be triggered from AFD by a seek

Lines 1-5 Link Here

(-)files/patch-libs__libmythui__mythgesture.cpp (-4 / +4 lines)
1	--- libs/libmythui/mythgesture.cpp.orig 2013-09-18 16:06:08.000000000 -0400	1	--- libs/libmythui/mythgesture.cpp.orig 2017-02-01 09:49:25 UTC
2	+++ libs/libmythui/mythgesture.cpp 2014-01-22 08:20:33.000000000 -0500	2	+++ libs/libmythui/mythgesture.cpp
3	@@ -28,6 +28,7 @@	3	@@ -28,6 +28,7 @@
4		4
5	#include "mythgesture.h"	5	#include "mythgesture.h"
Lines 7-14 Link Here
7	+#include <cstdlib>	7	+#include <cstdlib>
8	#include <cmath>	8	#include <cmath>
9	#include <algorithm>	9	#include <algorithm>
10		10	#include <complex>
11	@@ -283,7 +284,7 @@	11	@@ -288,7 +289,7 @@ bool MythGesture::record(const QPoint &
12	int dely = p.y() - points.back().y();	12	int dely = p.y() - points.back().y();
13		13
14	/* step by the greatest delta direction */	14	/* step by the greatest delta direction */

Lines 1-8 Link Here

(-)files/patch-libs__libmythui__mythpainter.cpp (-3 / +4 lines)
1	--- libs/libmythui/mythpainter.cpp.orig 2013-09-18 16:06:08.000000000 -0400	1	--- libs/libmythui/mythpainter.cpp.orig 2017-02-01 09:49:25 UTC
2	+++ libs/libmythui/mythpainter.cpp 2014-01-22 08:18:40.000000000 -0500	2	+++ libs/libmythui/mythpainter.cpp
3	@@ -1,5 +1,6 @@	3	@@ -1,6 +1,7 @@
4	#include <stdint.h>	4	#include <stdint.h>
5	#include <algorithm>	5	#include <algorithm>
		6	#include <complex>
6	+#include <cstdlib>	7	+#include <cstdlib>
7		8
8	// QT headers	9	// QT headers

Lines 1-11 Link Here

(-)files/patch-libs__libmythupnp__mmulticastsocketdevice.h (-6 / +5 lines)
1	--- libs/libmythupnp/mmulticastsocketdevice.h.orig 2013-09-18 16:06:08.000000000 -0400	1	--- libs/libmythupnp/mmulticastsocketdevice.h.orig 2017-02-01 09:49:25 UTC
2	+++ libs/libmythupnp/mmulticastsocketdevice.h 2014-01-22 08:24:26.000000000 -0500	2	+++ libs/libmythupnp/mmulticastsocketdevice.h
3	@@ -18,6 +18,7 @@	3	@@ -20,6 +20,7 @@
4	# include <ws2tcpip.h>	4	#ifdef _WIN32
5	# endif	5	# include <ws2tcpip.h>
6	#else	6	#else
7	+# include <sys/types.h>	7	+# include <sys/types.h>
8	# include <sys/socket.h>	8	# include <sys/socket.h>
9	# include <netinet/in.h>	9	# include <netinet/in.h>
10	# include <netinet/ip.h>	10	# include <netinet/ip.h>
11

Return to bug 219149

Lines 2-8 Link Here

(-)Makefile (-16 / +26 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mythtv	4	PORTNAME= mythtv
5	PORTVERSION= 0.28.7	5	PORTVERSION= 0.28.1
6	CATEGORIES= multimedia	6	CATEGORIES= multimedia
7		7
8	MAINTAINER= ports@FreeBSD.org	8	MAINTAINER= ports@FreeBSD.org
Lines 18-26 Link Here
18	libudf.so:sysutils/libcdio \	18	libudf.so:sysutils/libcdio \
19	libva.so:multimedia/libva \	19	libva.so:multimedia/libva \
20	libass.so:multimedia/libass \	20	libass.so:multimedia/libass \
21	libfftw3f.so:math/fftw3-float \
22	libfftw3_threads.so:math/fftw3 \	21	libfftw3_threads.so:math/fftw3 \
23	libjack.so:audio/jack	22	libexiv2.so:graphics/exiv2 \
		23	libsndio.so:audio/sndio \
		24	libGL.so:graphics/mesa-libs
		25
24	BUILD_DEPENDS= v4l_compat>=1.0.20100321:multimedia/v4l_compat \	26	BUILD_DEPENDS= v4l_compat>=1.0.20100321:multimedia/v4l_compat \
25	yasm:devel/yasm	27	yasm:devel/yasm
26	RUN_DEPENDS= tv_check:textproc/p5-xmltv \	28	RUN_DEPENDS= tv_check:textproc/p5-xmltv \
Lines 30-36 Link Here
30		32
31	USE_GITHUB= yes	33	USE_GITHUB= yes
32	GH_ACCOUNT= MythTV	34	GH_ACCOUNT= MythTV
33	GH_TAGNAME= ad97d24	35	GH_TAGNAME= 03f4403
34		36
35	WRKSRC_SUBDIR= ${PORTNAME}	37	WRKSRC_SUBDIR= ${PORTNAME}
36		38
Lines 40-49 Link Here
40	USES= gmake iconv libtool perl5 pkgconfig pathfix shebangfix ssl	42	USES= gmake iconv libtool perl5 pkgconfig pathfix shebangfix ssl
41	SHEBANG_FILES= programs/scripts/database/mythconverg_backup.pl \	43	SHEBANG_FILES= programs/scripts/database/mythconverg_backup.pl \
42	programs/scripts/database/mythconverg_restore.pl	44	programs/scripts/database/mythconverg_restore.pl
43	USE_QT4= corelib dbus gui sql network script linguist_build l10n sql-mysql_run \	45	#USE_QT4= corelib dbus declarative gui sql network script linguist_build l10n sql-mysql_run \
44	moc_build qmake_build rcc_build uic_build imageformats webkit xml	46	moc_build qmake_build rcc_build uic_build imageformats webkit xml
		47	USE_QT5= core declarative dbus gui l10n qmake sql sql_mysql_run network script widgets webkit xml
		48
45	USE_GL= gl	49	USE_GL= gl
46	USE_XORG= x11 xv xrandr xxf86vm xinerama xext	50	USE_XORG= x11 xcb xext xinerama xrandr xv xxf86vm
47	QT_NONSTANDARD= yes	51	QT_NONSTANDARD= yes
48	HAS_CONFIGURE= yes	52	HAS_CONFIGURE= yes
49	USE_LDCONFIG= ${PREFIX}/lib/mythtv/filters	53	USE_LDCONFIG= ${PREFIX}/lib/mythtv/filters
Lines 54-73 Link Here
54	USERS= mythtv	58	USERS= mythtv
55	GROUPS= mythtv	59	GROUPS= mythtv
56		60
57	MAKE_ENV= QTDIR="${PREFIX}" \
58	QMAKESPEC="${QMAKESPEC}"
59
60	CPPFLAGS+= ${QTCPPFLAGS}
61	CONFIGURE_ENV+= QMAKESPEC="${QMAKESPEC}" MOC="${MOC}" \
62	QTDIR="${PREFIX}"
63	CONFIGURE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/libdata/pkgconfig"	61	CONFIGURE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/libdata/pkgconfig"
64	LDFLAGS+= -L${LOCALBASE}/lib	62	LDFLAGS+= -L${LOCALBASE}/lib
65		63
66	CONFIGURE_ARGS= --prefix="${PREFIX}" --cc="${CC}" --cxx="${CXX}" --dvb-path="${LOCALBASE}/include/libdvbv5" \	64	CONFIGURE_ARGS= --prefix="${PREFIX}" --cc="${CC}" --cxx="${CXX}" --dvb-path="${LOCALBASE}/include/libdvbv5" \
67	--libxml2-path="${LOCALBASE}/include/libxml2" --enable-v4l2 --enable-ivtv --enable-xv \	65	--libxml2-path="${LOCALBASE}/include/libxml2" --enable-v4l2 --enable-ivtv --enable-xv \
68	--disable-audio-alsa --disable-indev=alsa --disable-outdev=alsa --disable-mythlogserver	66	--disable-audio-alsa --disable-indev=alsa --disable-outdev=alsa --disable-mythlogserver --qmake=${QMAKE}
69		67
70	QMAKESPEC?= ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++	68	QMAKESPECS?= ${LOCALBASE}/lib/qt5/mkspecs/freebsd-g++
71		69
72	OPTIONS_DEFINE= BINDINGS LIRC MYSQL OPENGL VDPAU	70	OPTIONS_DEFINE= BINDINGS LIRC MYSQL OPENGL VDPAU
73	OPTIONS_DEFAULT= BINDINGS OPENGL VDPAU	71	OPTIONS_DEFAULT= BINDINGS OPENGL VDPAU
Lines 82-89 Link Here
82	VDPAU_CONFIGURE_ENABLE= vdpau	80	VDPAU_CONFIGURE_ENABLE= vdpau
83		81
84	OPENGL_CONFIGURE_ENABLE= opengl-video	82	OPENGL_CONFIGURE_ENABLE= opengl-video
85	OPENGL_USE= QT4=opengl	83	OPENGL_USE= QT5=opengl
86		84
		85	SED_CMD= /usr/bin/sed
		86
87	.include <bsd.port.options.mk>	87	.include <bsd.port.options.mk>
88		88
89	SUB_FILES= pkg-message	89	SUB_FILES= pkg-message
Lines 121-127 Link Here
121	${WRKSRC}/configure \	121	${WRKSRC}/configure \
122	${WRKSRC}/libs/libmythtv/libmythtv.pro \	122	${WRKSRC}/libs/libmythtv/libmythtv.pro \
123	${WRKSRC}/bindings/perl/MythTV/Recording.pm \	123	${WRKSRC}/bindings/perl/MythTV/Recording.pm \
124	${WRKSRC}/programs/mythtranscode/replex/Makefile.standalone \	124	${WRKSRC}/programs/mythtranscode/external/replex/Makefile.standalone \
125	${WRKSRC}/programs/scripts/database/mythconverg_backup.pl \	125	${WRKSRC}/programs/scripts/database/mythconverg_backup.pl \
126	${WRKSRC}/programs/scripts/database/mythconverg_restore.pl \	126	${WRKSRC}/programs/scripts/database/mythconverg_restore.pl \
127	${WRKSRC}/programs/mythcommflag/mythcommflag-analyze	127	${WRKSRC}/programs/mythcommflag/mythcommflag-analyze
Lines 129-133 Link Here
129	post-install:	129	post-install:
130	@${MKDIR} ${STAGEDIR}${PREFIX}/share/mythtv/database	130	@${MKDIR} ${STAGEDIR}${PREFIX}/share/mythtv/database
131	@${CP} ${WRKSRC}/database/mc.sql ${STAGEDIR}${PREFIX}/share/mythtv/database	131	@${CP} ${WRKSRC}/database/mc.sql ${STAGEDIR}${PREFIX}/share/mythtv/database
		132	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
		133	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mythtv/filters/*.so
132		134
		135	.for filename in mythutil mythffmpeg mythfilldatabase mythfilerecorder mythccextractor \
		136	mythlcdserver mythfrontend mythpreviewgen mythjobqueue mythbackend \
		137	mythffprobe mythmetadatalookup mythtranscode mythcommflag mythffserver \
		138	mythavtest mythmediaserver mythhdhomerun_config mythtv-setup \
		139	mythreplex mythwelcome mythshutdown mythscreenwizard
		140	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${filename}
		141	.endfor
		142
133	.include <bsd.port.mk>	143	.include <bsd.port.mk>

Lines 1-6 Link Here

(-)files/patch-configure (-46 / +29 lines)
1	--- configure.orig 2013-09-18 20:06:08.000000000 +0000	1	--- configure.orig 2017-02-01 09:49:25 UTC
2	+++ configure 2013-10-18 11:11:10.000000000 +0000	2	+++ configure
3	@@ -846,28 +846,28 @@	3	@@ -979,35 +979,35 @@ check_cc(){
4	log check_cc "$@"	4	log check_cc "$@"
5	cat > $TMPC	5	cat > $TMPC
6	log_file $TMPC	6	log_file $TMPC
Lines 24-78 Link Here
24	+ check_cmd $cxx $CPPFLAGS $CXXFLAGS $ECXXFLAGS -I${prefix}/include "$@" $CXX_C -o $TMPO $TMPCPP	24	+ check_cmd $cxx $CPPFLAGS $CXXFLAGS $ECXXFLAGS -I${prefix}/include "$@" $CXX_C -o $TMPO $TMPCPP
25	}	25	}
26		26
		27	check_objcc(){
		28	log check_objcc "$@"
		29	cat > $TMPM
		30	log_file $TMPM
		31	- check_cmd $objcc -Werror=missing-prototypes $CPPFLAGS $CFLAGS $OBJCFLAGS "$@" $OBJCC_C $(cc_o $TMPO) $TMPM
		32	+ check_cmd $objcc -Werror=missing-prototypes $CPPFLAGS $CFLAGS $OBJCFLAGS -I${prefix}/include "$@" $OBJCC_C $(cc_o $TMPO) $TMPM
		33	}
		34
27	check_cpp(){	35	check_cpp(){
28	log check_cpp "$@"	36	log check_cpp "$@"
29	cat > $TMPC	37	cat > $TMPC
30	log_file $TMPC	38	log_file $TMPC
31	- check_cmd $cc $CPPFLAGS $CFLAGS "$@" $(cc_e $TMPO) $TMPC	39	- check_cmd $cc $CPPFLAGS $CFLAGS "$@" $(cc_e $TMPO) $TMPC
32	+ check_cmd $cc $CPPFLAGS $CFLAGS -I${prefix}/include "$@" $(cc_e $TMPO) $TMPC	40	+ check_cmd $cc $CPPFLAGS $CFLAGS -I${prefix}/include "$@" $(cc_e $TMPO) $TMPC
33	}	41	}
34		42
35	as_o(){	43	as_o(){
36	@@ -2539,7 +2539,7 @@	44	@@ -3364,7 +3364,7 @@ vbox_deps="backend"
		45	ceton_deps="backend"
		46	mpegtsraw_demuxer_deps="merge_libavformat_mpegts_c"
		47	mythtranscode_deps="backend frontend"
		48	-opengl_deps_any="agl_h GL_gl_h EGL_egl_h GLES2_gl2_h darwin windows x11"
		49	+opengl_deps_any="agl_h $GL_gl_h EGL_egl_h GLES2_gl2_h darwin windows x11"
		50	opengles_deps="GLES2_gl2_h"
		51	opengl_video_deps="opengl"
		52	opengl_themepainter_deps="opengl"
		53	@@ -6615,7 +6615,7 @@ if enabled taglib; then
		54	taglibs=`taglib-config --libs`
		55	fi
37		56
38	# machine	57	- if test $taglib_minor -lt 7 \|\| ! check_class_headers_cpp "taglib/fileref.h stdlib.h" TagLib::FileRef $tagincludes $taglibs -lstdc++; then
39	arch_default=$(uname -m)	58	+ if test $taglib_minor -lt 10 \|\| ! check_class_headers_cpp "/usr/local/include/taglib/fileref.h stdlib.h" TagLib::FileRef $tagincludes $taglibs -lstdc++; then
40	-cpu="generic"	59	die "ERROR: cannot find taglib 1.7 or later."
41	+cpu="i686"	60	fi
42	processor=`uname -p 2>/dev/null`	61	fi
43	processor_flags=""
44	tune="generic"
45	@@ -3931,7 +3931,7 @@
46	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*)
47	cpuflags="-march=$cpu"
48	enable cmov
49	- enable fast_cmov
50	+ disable fast_cmov
51	;;
52	# targets that do support conditional mov but on which it's slow
53	pentium4\|pentium4m\|prescott\|nocona)
54	@@ -4102,7 +4102,6 @@
55	append CCONFIG "freebsd"
56	# Workaround compile errors from missing u_int/uint def
57	CPPFLAGS=`echo $CPPFLAGS \| sed 's/-D_POSIX_C_SOURCE=200112//'`
58	- disable ivtv
59	enable backend
60	;;
61	bsd/os)
62	@@ -6383,6 +6382,7 @@
63	QMAKE_LIBDIR_QT-=${sysroot}${libdir}
64	QMAKE_LIBDIR-=${sysroot}${libdir}
65	LATE_LIBS+=-L${sysroot}${libdir}
66	+FREETYPE_CFLAGS-= -I/usr/local/include
67	EOF
68
69	#echo "endif # FFMPEG_CONFIG_MAK" >> $TMPMAK
70	@@ -6435,7 +6435,7 @@
71	BINDIR=\$(INSTALL_ROOT)$bindir
72	DATADIR=\$(INSTALL_ROOT)$datadir
73	MANDIR=\$(INSTALL_ROOT)$mandir
74	-CFLAGS=${CFLAGS} -w
75	+CFLAGS=${CFLAGS} -I/usr/local/include -w
76	endif # FFMPEG_CONFIG_MAK
77	EOF
78

Lines 1-22 Link Here

(-)files/patch-external__FFmpeg__configure (-16 / +44 lines)
1	--- external/FFmpeg/configure.orig 2010-08-23 18:54:20.000000000 +0200	1	--- external/FFmpeg/configure.orig 2017-02-01 09:49:25 UTC
2	+++ external/FFmpeg/configure 2010-11-01 21:13:19.000000000 +0100	2	+++ external/FFmpeg/configure
3	@@ -1528,8 +1528,8 @@	3	@@ -4234,7 +4234,7 @@ elif enabled mips; then
4	nm_opts='-g'	4	enable simd_align_16
5		5	enable fast_64bit
6	# machine	6	enable fast_clz
7	-arch_default=$(uname -m)	7	- enable fast_cmov
8	-cpu="generic"	8	+ disable fast_cmov
9	+arch_default=$(uname -p)	9	enable fast_unaligned
10	+cpu="i686"	10	disable aligned_stack
11		11	case $cpu in
12	# OS	12	@@ -4357,7 +4357,7 @@ elif enabled x86; then
13	target_os_default=$(tolower $(uname -s))	13	\|core\|atom\|bonnell\|nehalem\|westmere\|silvermont\|sandybridge\|ivybridge\|haswell\|broadwell\|amdfam10\|barcelona\|b[dt]ver)
14	@@ -2108,7 +2108,7 @@
15	i686\|pentiumpro\|pentium[23]\|pentium-m\|athlon\|athlon-tbird\|athlon-4\|athlon-[mx]p\|athlon64\|k8\|opteron\|athlon-fx\|core2\|amdfam10\|barcelona)
16	cpuflags="-march=$cpu"	14	cpuflags="-march=$cpu"
17	enable cmov	15	enable i686
18	- enable fast_cmov	16	- enable fast_cmov
19	+ disable fast_cmov	17	+ disable fast_cmov
20	;;	18	;;
21	# targets that do support conditional mov but on which it's slow	19	# targets that do support conditional mov but on which it's slow
22	pentium4\|pentium4m\|prescott\|nocona)	20	pentium4\|pentium4m\|prescott\|nocona)
		21	@@ -4458,7 +4458,7 @@ enabled spic && enable_weak pic
		22	case $target_os in
		23	aix)
		24	SHFLAGS=-shared
		25	- add_cppflags '-I\$(SRC_PATH)/compat/aix'
		26	+ add_cppflags '-I\$(sRC_PATH)/compat/aix'
		27	enabled shared && add_ldflags -Wl,-brtl
		28	;;
		29	android)
		30	@@ -6285,19 +6285,15 @@ DATADIR=\$(DESTDIR)$datadir
		31	DOCDIR=\$(DESTDIR)$docdir
		32	MANDIR=\$(DESTDIR)$mandir
		33	PKGCONFIGDIR=\$(DESTDIR)$pkgconfigdir
		34	-SRC_PATH=$source_path
		35	SRC_LINK=$source_link
		36	ifndef MAIN_MAKEFILE
		37	SRC_PATH:=\$(SRC_PATH:.%=..%)
		38	endif
		39	-CC_IDENT=$cc_ident
		40	ARCH=$arch
		41	INTRINSICS=$intrinsics
		42	-CC=$cc
		43	-CXX=$cxx
		44	-AS=$as
		45	OBJCC=$objcc
		46	LD=$ld
		47	+FFMPEG=$arch
		48	DEPCC=$dep_cc
		49	DEPCCFLAGS=$DEPCCFLAGS \$(CPPFLAGS)
		50	DEPAS=$as