sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename and update patches per current convention ahead of new version update

Browse source 
to make community testing of new version a little easier and eliminate
potential confusion.

PR:		225652
This commit is contained in:
Jason E. Hale 2018-03-02 14:20:03 +00:00
parent fc3fcfa999
commit ea56c3f287
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=463403
14 changed files with 63 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
multimedia/mythtv/files/patch-configure
View file

@ -1,6 +1,6 @@
--- configure.orig 2013-09-18 20:06:08.000000000 +0000 --- configure.orig 2015-06-16 16:03:30 UTC
+++ configure 2013-10-18 11:11:10.000000000 +0000 +++ configure
@@ -846,28 +846,28 @@ @@ -846,28 +846,28 @@ check_cc(){
log check_cc "$@" log check_cc "$@"
cat > $TMPC cat > $TMPC
log_file $TMPC log_file $TMPC
@ -33,7 +33,7 @@
} }
as_o(){ as_o(){
@@ -2539,7 +2539,7 @@ @@ -2539,7 +2539,7 @@ python_default="python"
# machine # machine
arch_default=$(uname -m) arch_default=$(uname -m)
@ -42,7 +42,7 @@
processor=`uname -p 2>/dev/null` processor=`uname -p 2>/dev/null`
processor_flags="" processor_flags=""
tune="generic" tune="generic"
@@ -3931,7 +3931,7 @@ @@ -3931,7 +3931,7 @@ elif enabled x86; then
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*) 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" cpuflags="-march=$cpu"
enable cmov enable cmov
@ -51,7 +51,7 @@
;; ;;
# targets that do support conditional mov but on which it's slow # targets that do support conditional mov but on which it's slow
pentium4|pentium4m|prescott|nocona) pentium4|pentium4m|prescott|nocona)
@@ -4102,7 +4102,6 @@ @@ -4102,7 +4102,6 @@ case $target_os in
append CCONFIG "freebsd" append CCONFIG "freebsd"
# Workaround compile errors from missing u_int/uint def # Workaround compile errors from missing u_int/uint def
CPPFLAGS=`echo $CPPFLAGS | sed 's/-D_POSIX_C_SOURCE=200112//'` CPPFLAGS=`echo $CPPFLAGS | sed 's/-D_POSIX_C_SOURCE=200112//'`
@ -59,7 +59,7 @@
enable backend enable backend
;; ;;
bsd/os) bsd/os)
@@ -6383,6 +6382,7 @@ @@ -6389,6 +6388,7 @@ cat <<EOF >> $TMPMAK
QMAKE_LIBDIR_QT-=${sysroot}${libdir} QMAKE_LIBDIR_QT-=${sysroot}${libdir}
QMAKE_LIBDIR-=${sysroot}${libdir} QMAKE_LIBDIR-=${sysroot}${libdir}
LATE_LIBS+=-L${sysroot}${libdir} LATE_LIBS+=-L${sysroot}${libdir}
@ -67,7 +67,7 @@
EOF EOF
#echo "endif # FFMPEG_CONFIG_MAK" >> $TMPMAK #echo "endif # FFMPEG_CONFIG_MAK" >> $TMPMAK
@@ -6435,7 +6435,7 @@ @@ -6441,7 +6441,7 @@ INCDIR=\$(INSTALL_ROOT)$incdir
BINDIR=\$(INSTALL_ROOT)$bindir BINDIR=\$(INSTALL_ROOT)$bindir
DATADIR=\$(INSTALL_ROOT)$datadir DATADIR=\$(INSTALL_ROOT)$datadir
MANDIR=\$(INSTALL_ROOT)$mandir MANDIR=\$(INSTALL_ROOT)$mandir

12
multimedia/mythtv/files/patch-external__FFmpeg__configure → multimedia/mythtv/files/patch-external_FFmpeg_configure
View file

@ -1,7 +1,7 @@
--- external/FFmpeg/configure.orig 2010-08-23 18:54:20.000000000 +0200 --- external/FFmpeg/configure.orig 2015-06-16 16:03:30 UTC
+++ external/FFmpeg/configure 2010-11-01 21:13:19.000000000 +0100 +++ external/FFmpeg/configure
@@ -1528,8 +1528,8 @@ @@ -2167,8 +2167,8 @@ yasmexe_default="yasm"
nm_opts='-g' nogas=":"
# machine # machine
-arch_default=$(uname -m) -arch_default=$(uname -m)
@ -11,8 +11,8 @@
# OS # OS
target_os_default=$(tolower $(uname -s)) target_os_default=$(tolower $(uname -s))
@@ -2108,7 +2108,7 @@ @@ -3137,7 +3137,7 @@ elif enabled x86; then
i686|pentiumpro|pentium[23]|pentium-m|athlon|athlon-tbird|athlon-4|athlon-[mx]p|athlon64|k8|opteron|athlon-fx|core2|amdfam10|barcelona) 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" cpuflags="-march=$cpu"
enable cmov enable cmov
- enable fast_cmov - enable fast_cmov

6
multimedia/mythtv/files/patch-external__FFmpeg__libavcodec__x86__ac3dsp_init.c → multimedia/mythtv/files/patch-external_FFmpeg_libavcodec_x86_ac3dsp__init.c
View file

@ -1,6 +1,6 @@
--- external/FFmpeg/libavcodec/x86/ac3dsp_init.c.orig 2013-09-18 20:06:08.000000000 +0000 --- external/FFmpeg/libavcodec/x86/ac3dsp_init.c.orig 2015-06-16 16:03:30 UTC
+++ external/FFmpeg/libavcodec/x86/ac3dsp_init.c 2013-10-18 11:58:01.000000000 +0000 +++ external/FFmpeg/libavcodec/x86/ac3dsp_init.c
@@ -51,7 +51,7 @@ @@ -51,7 +51,7 @@ extern void ff_ac3_extract_exponents_3dnow(uint8_t *ex
extern void ff_ac3_extract_exponents_sse2 (uint8_t *exp, int32_t *coef, int nb_coefs); 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); extern void ff_ac3_extract_exponents_ssse3(uint8_t *exp, int32_t *coef, int nb_coefs);

4
multimedia/mythtv/files/patch-external__zeromq__src__Makefile.am → multimedia/mythtv/files/patch-external_zeromq_src_Makefile.am
View file

@ -1,5 +1,5 @@
--- external/zeromq/src/Makefile.am.orig 2015-11-16 14:31:23.735432710 +0000 --- external/zeromq/src/Makefile.am.orig 2015-06-16 16:03:30 UTC
+++ external/zeromq/src/Makefile.am 2015-11-16 14:28:48.465433398 +0000 +++ external/zeromq/src/Makefile.am
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
lib_LTLIBRARIES = libmythzmq.la lib_LTLIBRARIES = libmythzmq.la

11
multimedia/mythtv/files/patch-libs__libmyth__remoteutil.h
View file

@ -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;

9
multimedia/mythtv/files/patch-libs__libmythui__mythpainter.cpp
View file

@ -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>

11
multimedia/mythtv/files/patch-libs__libmythupnp__mmulticastsocketdevice.h
View file

@ -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>

10
multimedia/mythtv/files/patch-libs_libmyth_remoteutil.h Normal file
View file

@ -0,0 +1,10 @@
--- libs/libmyth/remoteutil.h.orig 2015-06-16 16:03:30 UTC
+++ libs/libmyth/remoteutil.h
@@ -10,6 +10,7 @@
using namespace std;
#include "mythexp.h"
+#include <sys/types.h>
class ProgramInfo;
class MythEvent;

4
multimedia/mythtv/files/patch-libs__libmythdvdnav__dvdnav__dvdnav.c → multimedia/mythtv/files/patch-libs_libmythdvdnav_dvdnav_dvdnav.c
View file

@ -1,5 +1,5 @@
--- libs/libmythdvdnav/dvdnav/dvdnav.c.orig 2012-03-18 12:13:45.805789048 +0100 --- libs/libmythdvdnav/dvdnav/dvdnav.c.orig 2015-06-16 16:03:30 UTC
+++ libs/libmythdvdnav/dvdnav/dvdnav.c 2012-03-18 12:12:47.166812027 +0100 +++ libs/libmythdvdnav/dvdnav/dvdnav.c
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
#include <limits.h> #include <limits.h>
#include <string.h> #include <string.h>

10
multimedia/mythtv/files/patch-libs__libmythtv__recorders__dvbstreamhandler.cpp → multimedia/mythtv/files/patch-libs_libmythtv_recorders_dvbstreamhandler.cpp
View file

@ -1,6 +1,6 @@
--- libs/libmythtv/recorders/dvbstreamhandler.cpp.orig 2012-03-05 03:31:31.000000000 +0100 --- libs/libmythtv/recorders/dvbstreamhandler.cpp.orig 2015-06-16 16:03:30 UTC
+++ libs/libmythtv/recorders/dvbstreamhandler.cpp 2012-03-18 11:24:44.309770699 +0100 +++ libs/libmythtv/recorders/dvbstreamhandler.cpp
@@ -614,7 +614,7 @@ @@ -620,7 +620,7 @@ bool DVBPIDInfo::Open(const QString &dvb_dev, bool use
{ {
struct dmx_pes_filter_params pesFilterParams; struct dmx_pes_filter_params pesFilterParams;
memset(&pesFilterParams, 0, sizeof(struct dmx_pes_filter_params)); memset(&pesFilterParams, 0, sizeof(struct dmx_pes_filter_params));
@ -9,7 +9,7 @@
pesFilterParams.input = DMX_IN_FRONTEND; pesFilterParams.input = DMX_IN_FRONTEND;
pesFilterParams.output = DMX_OUT_TS_TAP; pesFilterParams.output = DMX_OUT_TS_TAP;
pesFilterParams.flags = DMX_IMMEDIATE_START; pesFilterParams.flags = DMX_IMMEDIATE_START;
@@ -634,7 +634,7 @@ @@ -640,7 +640,7 @@ bool DVBPIDInfo::Open(const QString &dvb_dev, bool use
{ {
struct dmx_sct_filter_params sctFilterParams; struct dmx_sct_filter_params sctFilterParams;
memset(&sctFilterParams, 0, sizeof(struct dmx_sct_filter_params)); memset(&sctFilterParams, 0, sizeof(struct dmx_sct_filter_params));
@ -18,7 +18,7 @@
{ {
case 0x0: // PAT case 0x0: // PAT
sctFilterParams.filter.filter[0] = 0; sctFilterParams.filter.filter[0] = 0;
@@ -670,7 +670,7 @@ @@ -676,7 +676,7 @@ bool DVBPIDInfo::Open(const QString &dvb_dev, bool use
sctFilterParams.filter.mask[0] = 0x00; sctFilterParams.filter.mask[0] = 0x00;
break; break;
} }

6
multimedia/mythtv/files/patch-libs__libmythtv__videoout_vdpau.cpp → multimedia/mythtv/files/patch-libs_libmythtv_videoout__vdpau.cpp
View file

@ -1,6 +1,6 @@
--- libs/libmythtv/videoout_vdpau.cpp.orig 2010-02-27 06:58:11.000000000 +0100 --- libs/libmythtv/videoout_vdpau.cpp.orig 2015-06-16 16:03:30 UTC
+++ libs/libmythtv/videoout_vdpau.cpp 2010-04-06 17:40:50.000000000 +0200 +++ libs/libmythtv/videoout_vdpau.cpp
@@ -395,7 +395,7 @@ @@ -442,7 +442,7 @@ void VideoOutputVDPAU::PrepareFrame(VideoFrame *frame,
if (frame) if (frame)
{ {
// FIXME for 0.23. This should be triggered from AFD by a seek // FIXME for 0.23. This should be triggered from AFD by a seek

8
multimedia/mythtv/files/patch-libs__libmythui__mythgesture.cpp → multimedia/mythtv/files/patch-libs_libmythui_mythgesture.cpp
View file

@ -1,5 +1,5 @@
--- libs/libmythui/mythgesture.cpp.orig 2013-09-18 16:06:08.000000000 -0400 --- libs/libmythui/mythgesture.cpp.orig 2015-06-16 16:03:30 UTC
+++ libs/libmythui/mythgesture.cpp 2014-01-22 08:20:33.000000000 -0500 +++ libs/libmythui/mythgesture.cpp
@@ -28,6 +28,7 @@ @@ -28,6 +28,7 @@
#include "mythgesture.h" #include "mythgesture.h"
@ -7,8 +7,8 @@
+#include <cstdlib> +#include <cstdlib>
#include <cmath> #include <cmath>
#include <algorithm> #include <algorithm>
#include <complex>
@@ -283,7 +284,7 @@ @@ -284,7 +285,7 @@ bool MythGesture::record(const QPoint & p)
int dely = p.y() - points.back().y(); int dely = p.y() - points.back().y();
/* step by the greatest delta direction */ /* step by the greatest delta direction */

10
multimedia/mythtv/files/patch-libs_libmythui_mythpainter.cpp Normal file
View file

@ -0,0 +1,10 @@
--- libs/libmythui/mythpainter.cpp.orig 2015-06-16 16:03:30 UTC
+++ libs/libmythui/mythpainter.cpp
@@ -1,6 +1,7 @@
#include <stdint.h>
#include <algorithm>
#include <complex>
+#include <cstdlib>
// QT headers
#include <QRect>

10
multimedia/mythtv/files/patch-libs_libmythupnp_mmulticastsocketdevice.h Normal file
View file

@ -0,0 +1,10 @@
--- libs/libmythupnp/mmulticastsocketdevice.h.orig 2015-06-16 16:03:30 UTC
+++ libs/libmythupnp/mmulticastsocketdevice.h
@@ -22,6 +22,7 @@
# include <ws2tcpip.h>
# endif
#else
+# include <sys/types.h>
# include <sys/socket.h>
# include <netinet/in.h>
# include <netinet/ip.h>