Attachment 182780 Details for Bug 219149 – svn-diff-mythtv_03f4403_v4

[patch] svn-diff-mythtv_03f4403_v4

svn-diff-mythtv_03f4403 (text/plain), 17.48 KB, created by Walter Schwarzenfeld on 2017-05-21 16:57:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Walter Schwarzenfeld

Created: 2017-05-21 16:57:34 UTC

Size: 17.48 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 440497)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	mythtv
>-PORTVERSION=	0.28.7
>+PORTVERSION=	0.28.1
> CATEGORIES=	multimedia
> 
> MAINTAINER=	ports@FreeBSD.org
>@@ -18,9 +18,11 @@
> 		libudf.so:sysutils/libcdio \
> 		libva.so:multimedia/libva \
> 		libass.so:multimedia/libass \
>-		libfftw3f.so:math/fftw3-float \
> 		libfftw3_threads.so:math/fftw3 \
>-		libjack.so:audio/jack
>+		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 \
>@@ -30,7 +32,7 @@
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	MythTV
>-GH_TAGNAME=	ad97d24
>+GH_TAGNAME=	03f4403
> 
> WRKSRC_SUBDIR=	${PORTNAME}
> 
>@@ -40,10 +42,12 @@
> 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 gui sql network script linguist_build l10n sql-mysql_run \
>+#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 xv xrandr xxf86vm xinerama xext
>+USE_XORG=	x11 xcb xext xinerama xrandr xv xxf86vm
> QT_NONSTANDARD=	yes
> HAS_CONFIGURE=	yes
> USE_LDCONFIG=	${PREFIX}/lib/mythtv/filters
>@@ -54,20 +58,14 @@
> 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
>+		--disable-audio-alsa --disable-indev=alsa --disable-outdev=alsa --disable-mythlogserver --qmake=${QMAKE}
> 
>-QMAKESPEC?=	${LOCALBASE}/share/qt4/mkspecs/freebsd-g++
>+QMAKESPECS?=	${LOCALBASE}/lib/qt5/mkspecs/freebsd-g++
> 
> OPTIONS_DEFINE=	BINDINGS LIRC MYSQL OPENGL VDPAU
> OPTIONS_DEFAULT=	BINDINGS OPENGL VDPAU
>@@ -82,8 +80,10 @@
> VDPAU_CONFIGURE_ENABLE=	vdpau
> 
> OPENGL_CONFIGURE_ENABLE=	opengl-video
>-OPENGL_USE=	QT4=opengl
>+OPENGL_USE=	QT5=opengl
> 
>+SED_CMD=	/usr/bin/sed
>+
> .include <bsd.port.options.mk>
> 
> SUB_FILES=	pkg-message
>@@ -121,7 +121,7 @@
> 		${WRKSRC}/configure \
> 		${WRKSRC}/libs/libmythtv/libmythtv.pro \
> 		${WRKSRC}/bindings/perl/MythTV/Recording.pm \
>-		${WRKSRC}/programs/mythtranscode/replex/Makefile.standalone \
>+		${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
>@@ -129,5 +129,15 @@
> 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>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 440497)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1484727010
>-SHA256 (MythTV-mythtv-0.28.7-ad97d24_GH0.tar.gz) = 9e3b0782e7627fdbb91641ac39e2c39d3fc01ee1a57152c74df9c9116e966238
>-SIZE (MythTV-mythtv-0.28.7-ad97d24_GH0.tar.gz) = 85651303
>+TIMESTAMP = 1495384962
>+SHA256 (MythTV-mythtv-0.28.1-03f4403_GH0.tar.gz) = fa2e8d3dd18495ea71c9b60657e84fcea1013118ca0190241b4e220fc1c33c73
>+SIZE (MythTV-mythtv-0.28.1-03f4403_GH0.tar.gz) = 104461043
>Index: files/patch-configure
>===================================================================
>--- files/patch-configure	(revision 440497)
>+++ files/patch-configure	(working copy)
>@@ -1,6 +1,6 @@
>---- configure.orig	2013-09-18 20:06:08.000000000 +0000
>-+++ configure	2013-10-18 11:11:10.000000000 +0000
>-@@ -846,28 +846,28 @@
>+--- configure.orig	2017-02-01 09:49:25 UTC
>++++ configure
>+@@ -979,35 +979,35 @@ check_cc(){
>      log check_cc "$@"
>      cat > $TMPC
>      log_file $TMPC
>@@ -24,55 +24,38 @@
> +    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
>++    check_cmd $cc $CPPFLAGS $CFLAGS -I${prefix}/include  "$@" $(cc_e $TMPO) $TMPC
>  }
>  
>  as_o(){
>-@@ -2539,7 +2539,7 @@
>+@@ -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
>  
>- # machine
>- arch_default=$(uname -m)
>--cpu="generic"
>-+cpu="i686"
>- processor=`uname -p 2>/dev/null`
>- 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
>- 
>+-    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
>Index: files/patch-external__FFmpeg__configure
>===================================================================
>--- files/patch-external__FFmpeg__configure	(revision 440497)
>+++ files/patch-external__FFmpeg__configure	(working copy)
>@@ -1,22 +1,50 @@
>---- external/FFmpeg/configure.orig	2010-08-23 18:54:20.000000000 +0200
>-+++ external/FFmpeg/configure	2010-11-01 21:13:19.000000000 +0100
>-@@ -1528,8 +1528,8 @@
>- nm_opts='-g'
>- 
>- # machine
>--arch_default=$(uname -m)
>--cpu="generic"
>-+arch_default=$(uname -p)
>-+cpu="i686"
>- 
>- # OS
>- target_os_default=$(tolower $(uname -s))
>-@@ -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)
>+--- 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*)
>              cpuflags="-march=$cpu"
>-             enable cmov
>+             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
>Index: files/patch-external__FFmpeg__libavcodec__x86__ac3dsp_init.c
>===================================================================
>--- files/patch-external__FFmpeg__libavcodec__x86__ac3dsp_init.c	(revision 440497)
>+++ files/patch-external__FFmpeg__libavcodec__x86__ac3dsp_init.c	(working copy)
>@@ -1,8 +1,8 @@
>---- 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);
>+--- external/FFmpeg/libavcodec/x86/ac3dsp_init.c.orig	2017-02-01 09:49:25 UTC
>++++ external/FFmpeg/libavcodec/x86/ac3dsp_init.c
>+@@ -63,7 +63,7 @@ void ff_apply_window_int16_ssse3(int16_t
>+ void ff_apply_window_int16_ssse3_atom(int16_t *output, const int16_t *input,
>+                                       const int16_t *window, unsigned int len);
>  
> -#if ARCH_X86_32 && defined(__INTEL_COMPILER)
> +#if ARCH_X86_32 && (defined(__INTEL_COMPILER) || defined(__clang__))
>Index: files/patch-external__libmythdvdnav_libdvdnav_highlight_c
>===================================================================
>--- files/patch-external__libmythdvdnav_libdvdnav_highlight_c	(nonexistent)
>+++ files/patch-external__libmythdvdnav_libdvdnav_highlight_c	(working copy)
>@@ -0,0 +1,10 @@
>+--- external/libmythdvdnav/dvdnav/highlight.c.orig	2017-05-14 21:46:57 UTC
>++++ external/libmythdvdnav/dvdnav/highlight.c
>+@@ -29,6 +29,7 @@
>+ #include <limits.h>
>+ #include <string.h>
>+ #include <sys/time.h>
>++#include  "dvdnav/dvd_types.h"
>+ #include <dvdread/nav_types.h>
>+ #include "dvdnav/dvdnav.h"
>+ #include "vm/decoder.h"
>
>Property changes on: files/patch-external__libmythdvdnav_libdvdnav_highlight_c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-external__zeromq__src__Makefile.am
>===================================================================
>--- files/patch-external__zeromq__src__Makefile.am	(revision 440497)
>+++ files/patch-external__zeromq__src__Makefile.am	(working copy)
>@@ -1,5 +1,5 @@
>---- external/zeromq/src/Makefile.am.orig	2015-11-16 14:31:23.735432710 +0000
>-+++ external/zeromq/src/Makefile.am	2015-11-16 14:28:48.465433398 +0000
>+--- external/zeromq/src/Makefile.am.orig	2017-02-01 09:49:25 UTC
>++++ external/zeromq/src/Makefile.am
> @@ -1,6 +1,6 @@
>  lib_LTLIBRARIES = libmythzmq.la
>  
>Index: files/patch-libs__libmyth__remoteutil.h
>===================================================================
>--- files/patch-libs__libmyth__remoteutil.h	(revision 440497)
>+++ files/patch-libs__libmyth__remoteutil.h	(working copy)
>@@ -1,7 +1,7 @@
>---- libs/libmyth/remoteutil.h.orig	2013-09-18 16:06:08.000000000 -0400
>-+++ libs/libmyth/remoteutil.h	2014-01-22 08:26:34.000000000 -0500
>-@@ -8,6 +8,7 @@
>- using namespace std;
>+--- libs/libmyth/remoteutil.h.orig	2017-02-01 09:49:25 UTC
>++++ libs/libmyth/remoteutil.h
>+@@ -10,6 +10,7 @@
>+ using std::vector;
>  
>  #include "mythexp.h"
> +#include <sys/types.h>
>@@ -8,4 +8,3 @@
>  
>  class ProgramInfo;
>  class MythEvent;
>-
>Index: files/patch-libs__libmythdvdnav__dvdnav__dvdnav.c
>===================================================================
>--- files/patch-libs__libmythdvdnav__dvdnav__dvdnav.c	(revision 440497)
>+++ files/patch-libs__libmythdvdnav__dvdnav__dvdnav.c	(nonexistent)
>@@ -1,11 +0,0 @@
>---- libs/libmythdvdnav/dvdnav/dvdnav.c.orig	2012-03-18 12:13:45.805789048 +0100
>-+++ libs/libmythdvdnav/dvdnav/dvdnav.c	2012-03-18 12:12:47.166812027 +0100
>-@@ -33,7 +33,7 @@
>- #include <limits.h>
>- #include <string.h>
>- #include <sys/time.h>
>--#include "dvdnav/dvdnav.h"
>-+#include "dvdnav.h"
>- #include <dvdread/dvd_reader.h>
>- #include <dvdread/nav_types.h>
>- #include <dvdread/ifo_types.h> /* For vm_cmd_t */
>
>Property changes on: files/patch-libs__libmythdvdnav__dvdnav__dvdnav.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-libs__libmythtv__videoout_vdpau.cpp
>===================================================================
>--- files/patch-libs__libmythtv__videoout_vdpau.cpp	(revision 440497)
>+++ files/patch-libs__libmythtv__videoout_vdpau.cpp	(working copy)
>@@ -1,6 +1,6 @@
>---- libs/libmythtv/videoout_vdpau.cpp.orig	2010-02-27 06:58:11.000000000 +0100
>-+++ libs/libmythtv/videoout_vdpau.cpp	2010-04-06 17:40:50.000000000 +0200
>-@@ -395,7 +395,7 @@
>+--- libs/libmythtv/videoout_vdpau.cpp.orig	2017-02-01 09:49:25 UTC
>++++ libs/libmythtv/videoout_vdpau.cpp
>+@@ -436,7 +436,7 @@ void VideoOutputVDPAU::PrepareFrame(Vide
>      if (frame)
>      {
>          // FIXME for 0.23. This should be triggered from AFD by a seek
>Index: files/patch-libs__libmythui__mythgesture.cpp
>===================================================================
>--- files/patch-libs__libmythui__mythgesture.cpp	(revision 440497)
>+++ files/patch-libs__libmythui__mythgesture.cpp	(working copy)
>@@ -1,5 +1,5 @@
>---- libs/libmythui/mythgesture.cpp.orig	2013-09-18 16:06:08.000000000 -0400
>-+++ libs/libmythui/mythgesture.cpp	2014-01-22 08:20:33.000000000 -0500
>+--- libs/libmythui/mythgesture.cpp.orig	2017-02-01 09:49:25 UTC
>++++ libs/libmythui/mythgesture.cpp
> @@ -28,6 +28,7 @@
>  
>  #include "mythgesture.h"
>@@ -7,8 +7,8 @@
> +#include <cstdlib>
>  #include <cmath>
>  #include <algorithm>
>- 
>-@@ -283,7 +284,7 @@
>+ #include <complex>
>+@@ -288,7 +289,7 @@ bool MythGesture::record(const QPoint & 
>      int dely = p.y() - points.back().y();
>  
>      /* step by the greatest delta direction */
>Index: files/patch-libs__libmythui__mythpainter.cpp
>===================================================================
>--- files/patch-libs__libmythui__mythpainter.cpp	(revision 440497)
>+++ files/patch-libs__libmythui__mythpainter.cpp	(working copy)
>@@ -1,8 +1,9 @@
>---- libs/libmythui/mythpainter.cpp.orig	2013-09-18 16:06:08.000000000 -0400
>-+++ libs/libmythui/mythpainter.cpp	2014-01-22 08:18:40.000000000 -0500
>-@@ -1,5 +1,6 @@
>+--- libs/libmythui/mythpainter.cpp.orig	2017-02-01 09:49:25 UTC
>++++ libs/libmythui/mythpainter.cpp
>+@@ -1,6 +1,7 @@
>  #include <stdint.h>
>  #include <algorithm>
>+ #include <complex>
> +#include <cstdlib>
>  
>  // QT headers
>Index: files/patch-libs__libmythupnp__mmulticastsocketdevice.h
>===================================================================
>--- files/patch-libs__libmythupnp__mmulticastsocketdevice.h	(revision 440497)
>+++ files/patch-libs__libmythupnp__mmulticastsocketdevice.h	(working copy)
>@@ -1,11 +1,10 @@
>---- libs/libmythupnp/mmulticastsocketdevice.h.orig	2013-09-18 16:06:08.000000000 -0400
>-+++ libs/libmythupnp/mmulticastsocketdevice.h	2014-01-22 08:24:26.000000000 -0500
>-@@ -18,6 +18,7 @@
>- #  include <ws2tcpip.h>
>- # endif
>+--- libs/libmythupnp/mmulticastsocketdevice.h.orig	2017-02-01 09:49:25 UTC
>++++ libs/libmythupnp/mmulticastsocketdevice.h
>+@@ -20,6 +20,7 @@
>+ #ifdef _WIN32
>+ # include <ws2tcpip.h>
>  #else
> +# include <sys/types.h>
>  # include <sys/socket.h>
>  # include <netinet/in.h>
>  # include <netinet/ip.h>
>-

Actions: View | Diff

Attachments on bug 219149: 182413 | 182439 | 182440 | 182459 | 182499 | 182501 | 182503 | 182636 | 182638 | 182716 | 182725 | 182739 | 182742 | 182752 | 182773 | 182777 | 182780 | 182783 | 182785 | 182786 | 184585