summaryrefslogtreecommitdiff
path: root/multimedia/mythtv-frontend/files
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia/mythtv-frontend/files')
-rw-r--r--multimedia/mythtv-frontend/files/patch-configure78
-rw-r--r--multimedia/mythtv-frontend/files/patch-external__FFmpeg__configure22
-rw-r--r--multimedia/mythtv-frontend/files/patch-external__FFmpeg__libavcodec__x86__ac3dsp_init.c11
-rw-r--r--multimedia/mythtv-frontend/files/patch-external__zeromq__src__Makefile.am10
-rw-r--r--multimedia/mythtv-frontend/files/patch-libs__libmyth__remoteutil.h11
-rw-r--r--multimedia/mythtv-frontend/files/patch-libs__libmythdvdnav__dvdnav__dvdnav.c11
-rw-r--r--multimedia/mythtv-frontend/files/patch-libs__libmythtv__recorders__dvbstreamhandler.cpp29
-rw-r--r--multimedia/mythtv-frontend/files/patch-libs__libmythtv__videoout_vdpau.cpp11
-rw-r--r--multimedia/mythtv-frontend/files/patch-libs__libmythui__mythgesture.cpp19
-rw-r--r--multimedia/mythtv-frontend/files/patch-libs__libmythui__mythpainter.cpp9
-rw-r--r--multimedia/mythtv-frontend/files/patch-libs__libmythupnp__mmulticastsocketdevice.h11
-rw-r--r--multimedia/mythtv-frontend/files/patch-programs__programs.pro12
12 files changed, 0 insertions, 234 deletions
diff --git a/multimedia/mythtv-frontend/files/patch-configure b/multimedia/mythtv-frontend/files/patch-configure
deleted file mode 100644
index bf2acae42795..000000000000
--- a/multimedia/mythtv-frontend/files/patch-configure
+++ /dev/null
@@ -1,78 +0,0 @@
---- configure.orig 2013-09-18 20:06:08.000000000 +0000
-+++ configure 2013-10-18 11:11:10.000000000 +0000
-@@ -846,28 +846,28 @@
- log check_cc "$@"
- cat > $TMPC
- log_file $TMPC
-- check_cmd $cc $CPPFLAGS $CFLAGS "$@" $CC_C $(cc_o $TMPO) $TMPC
-+ check_cmd $cc $CPPFLAGS $CFLAGS -I${prefix}/include "$@" $CC_C $(cc_o $TMPO) $TMPC
- }
-
- check_cxx(){
- log check_cxx "$@"
- cat > $TMPCPP
- log_file $TMPCPP
-- check_cmd $cxx $CPPFLAGS $CXXFLAGS "$@" $CXX_C -o $TMPO $TMPCPP
-+ check_cmd $cxx $CPPFLAGS $CXXFLAGS -I${prefix}/include "$@" $CXX_C -o $TMPO $TMPCPP
- }
-
- check_ecxx(){
- log check_cxx "$@"
- cat > $TMPCPP
- log_file $TMPCPP
-- check_cmd $cxx $CPPFLAGS $CXXFLAGS $ECXXFLAGS "$@" $CXX_C -o $TMPO $TMPCPP
-+ check_cmd $cxx $CPPFLAGS $CXXFLAGS $ECXXFLAGS -I${prefix}/include "$@" $CXX_C -o $TMPO $TMPCPP
- }
-
- check_cpp(){
- log check_cpp "$@"
- cat > $TMPC
- log_file $TMPC
-- check_cmd $cc $CPPFLAGS $CFLAGS "$@" $(cc_e $TMPO) $TMPC
-+ check_cmd $cc $CPPFLAGS $CFLAGS -I${prefix}/include "$@" $(cc_e $TMPO) $TMPC
- }
-
- as_o(){
-@@ -2539,7 +2539,7 @@
-
- # 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
-
diff --git a/multimedia/mythtv-frontend/files/patch-external__FFmpeg__configure b/multimedia/mythtv-frontend/files/patch-external__FFmpeg__configure
deleted file mode 100644
index cc641f1e2028..000000000000
--- a/multimedia/mythtv-frontend/files/patch-external__FFmpeg__configure
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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)
- 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)
diff --git a/multimedia/mythtv-frontend/files/patch-external__FFmpeg__libavcodec__x86__ac3dsp_init.c b/multimedia/mythtv-frontend/files/patch-external__FFmpeg__libavcodec__x86__ac3dsp_init.c
deleted file mode 100644
index 7c8f5758f0c7..000000000000
--- a/multimedia/mythtv-frontend/files/patch-external__FFmpeg__libavcodec__x86__ac3dsp_init.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- external/FFmpeg/libavcodec/x86/ac3dsp_init.c.orig 2013-09-18 20:06:08.000000000 +0000
-+++ external/FFmpeg/libavcodec/x86/ac3dsp_init.c 2013-10-18 11:58:01.000000000 +0000
-@@ -51,7 +51,7 @@
- extern void ff_ac3_extract_exponents_sse2 (uint8_t *exp, int32_t *coef, int nb_coefs);
- extern void ff_ac3_extract_exponents_ssse3(uint8_t *exp, int32_t *coef, int nb_coefs);
-
--#if ARCH_X86_32 && defined(__INTEL_COMPILER)
-+#if ARCH_X86_32 && (defined(__INTEL_COMPILER) || defined(__clang__))
- # undef HAVE_7REGS
- # define HAVE_7REGS 0
- #endif
diff --git a/multimedia/mythtv-frontend/files/patch-external__zeromq__src__Makefile.am b/multimedia/mythtv-frontend/files/patch-external__zeromq__src__Makefile.am
deleted file mode 100644
index 83d9d991e45d..000000000000
--- a/multimedia/mythtv-frontend/files/patch-external__zeromq__src__Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
-@@ -1,6 +1,6 @@
- lib_LTLIBRARIES = libmythzmq.la
-
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(PKG_CONFIG_PATH)
- pkgconfig_DATA = libmythzmq.pc
-
- include_HEADERS = ../include/zmq.h ../include/zmq.hpp ../include/zmq_utils.h
diff --git a/multimedia/mythtv-frontend/files/patch-libs__libmyth__remoteutil.h b/multimedia/mythtv-frontend/files/patch-libs__libmyth__remoteutil.h
deleted file mode 100644
index e74d28832a41..000000000000
--- a/multimedia/mythtv-frontend/files/patch-libs__libmyth__remoteutil.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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;
-
- #include "mythexp.h"
-+#include <sys/types.h>
-
- class ProgramInfo;
- class MythEvent;
-
diff --git a/multimedia/mythtv-frontend/files/patch-libs__libmythdvdnav__dvdnav__dvdnav.c b/multimedia/mythtv-frontend/files/patch-libs__libmythdvdnav__dvdnav__dvdnav.c
deleted file mode 100644
index e5babf1d7b69..000000000000
--- a/multimedia/mythtv-frontend/files/patch-libs__libmythdvdnav__dvdnav__dvdnav.c
+++ /dev/null
@@ -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 */
diff --git a/multimedia/mythtv-frontend/files/patch-libs__libmythtv__recorders__dvbstreamhandler.cpp b/multimedia/mythtv-frontend/files/patch-libs__libmythtv__recorders__dvbstreamhandler.cpp
deleted file mode 100644
index bf96bcb6ad9f..000000000000
--- a/multimedia/mythtv-frontend/files/patch-libs__libmythtv__recorders__dvbstreamhandler.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- libs/libmythtv/recorders/dvbstreamhandler.cpp.orig 2012-03-05 03:31:31.000000000 +0100
-+++ libs/libmythtv/recorders/dvbstreamhandler.cpp 2012-03-18 11:24:44.309770699 +0100
-@@ -614,7 +614,7 @@
- {
- struct dmx_pes_filter_params pesFilterParams;
- memset(&pesFilterParams, 0, sizeof(struct dmx_pes_filter_params));
-- pesFilterParams.pid = (__u16) _pid;
-+ pesFilterParams.pid = (uint16_t) _pid;
- pesFilterParams.input = DMX_IN_FRONTEND;
- pesFilterParams.output = DMX_OUT_TS_TAP;
- pesFilterParams.flags = DMX_IMMEDIATE_START;
-@@ -634,7 +634,7 @@
- {
- struct dmx_sct_filter_params sctFilterParams;
- memset(&sctFilterParams, 0, sizeof(struct dmx_sct_filter_params));
-- switch ( (__u16) _pid )
-+ switch ( (uint16_t) _pid )
- {
- case 0x0: // PAT
- sctFilterParams.filter.filter[0] = 0;
-@@ -670,7 +670,7 @@
- sctFilterParams.filter.mask[0] = 0x00;
- break;
- }
-- sctFilterParams.pid = (__u16) _pid;
-+ sctFilterParams.pid = (uint16_t) _pid;
- sctFilterParams.timeout = 0;
- sctFilterParams.flags = DMX_IMMEDIATE_START;
-
diff --git a/multimedia/mythtv-frontend/files/patch-libs__libmythtv__videoout_vdpau.cpp b/multimedia/mythtv-frontend/files/patch-libs__libmythtv__videoout_vdpau.cpp
deleted file mode 100644
index 8a90a59ac90c..000000000000
--- a/multimedia/mythtv-frontend/files/patch-libs__libmythtv__videoout_vdpau.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 @@
- if (frame)
- {
- // FIXME for 0.23. This should be triggered from AFD by a seek
-- if ((abs(frame->frameNumber - framesPlayed) > 8))
-+ if ((labs(frame->frameNumber - framesPlayed) > 8))
- ClearReferenceFrames();
- new_frame = (framesPlayed != frame->frameNumber + 1);
- framesPlayed = frame->frameNumber + 1;
diff --git a/multimedia/mythtv-frontend/files/patch-libs__libmythui__mythgesture.cpp b/multimedia/mythtv-frontend/files/patch-libs__libmythui__mythgesture.cpp
deleted file mode 100644
index 2f91cb2565a2..000000000000
--- a/multimedia/mythtv-frontend/files/patch-libs__libmythui__mythgesture.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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
-@@ -28,6 +28,7 @@
-
- #include "mythgesture.h"
-
-+#include <cstdlib>
- #include <cmath>
- #include <algorithm>
-
-@@ -283,7 +284,7 @@
- int dely = p.y() - points.back().y();
-
- /* step by the greatest delta direction */
-- if (abs(delx) > abs(dely))
-+ if (std::abs(delx) > std::abs(dely))
- {
- float iy = points.back().y();
-
diff --git a/multimedia/mythtv-frontend/files/patch-libs__libmythui__mythpainter.cpp b/multimedia/mythtv-frontend/files/patch-libs__libmythui__mythpainter.cpp
deleted file mode 100644
index 9faea34640a0..000000000000
--- a/multimedia/mythtv-frontend/files/patch-libs__libmythui__mythpainter.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
---- 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 @@
- #include <stdint.h>
- #include <algorithm>
-+#include <cstdlib>
-
- // QT headers
- #include <QRect>
diff --git a/multimedia/mythtv-frontend/files/patch-libs__libmythupnp__mmulticastsocketdevice.h b/multimedia/mythtv-frontend/files/patch-libs__libmythupnp__mmulticastsocketdevice.h
deleted file mode 100644
index a0c40c5ea947..000000000000
--- a/multimedia/mythtv-frontend/files/patch-libs__libmythupnp__mmulticastsocketdevice.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
- #else
-+# include <sys/types.h>
- # include <sys/socket.h>
- # include <netinet/in.h>
- # include <netinet/ip.h>
-
diff --git a/multimedia/mythtv-frontend/files/patch-programs__programs.pro b/multimedia/mythtv-frontend/files/patch-programs__programs.pro
deleted file mode 100644
index 24db57377558..000000000000
--- a/multimedia/mythtv-frontend/files/patch-programs__programs.pro
+++ /dev/null
@@ -1,12 +0,0 @@
---- programs/programs.pro.orig 2012-03-19 06:39:10.000000000 +0100
-+++ programs/programs.pro 2012-03-21 23:55:00.883069453 +0100
-@@ -11,9 +11,4 @@
- !mingw: SUBDIRS += mythtranscode/replex
- }
-
--using_backend {
-- SUBDIRS += mythbackend mythfilldatabase mythtv-setup scripts
-- SUBDIRS += mythmetadatalookup
--}
--
- using_mythtranscode: SUBDIRS += mythtranscode