Page MenuHomeFreeBSD
Files F153811108

D8930.id23315.diff
No OneTemporary
Actions

D8930.id23315.diff
View Options

Index: multimedia/mencoder/Makefile
===================================================================
--- multimedia/mencoder/Makefile
+++ multimedia/mencoder/Makefile
@@ -3,7 +3,6 @@
PORTNAME= mencoder
PORTVERSION= ${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
-PORTREVISION= 2
CATEGORIES= multimedia audio
MAINTAINER= riggs@FreeBSD.org
@@ -91,6 +90,9 @@
@${ECHO_MSG} "DEFAULT_DVD_DEVICE=${DEFAULT_DVD_DEVICE}"
@${ECHO_MSG} "DEFAULT_CDROM_DEVICE=${DEFAULT_CDROM_DEVICE}"
+pre-patch:
+ @${LN} -s `cd ${.CURDIR}/../ffmpeg && ${MAKE} -V WRKSRC` ${WRKSRC}/ffmpeg
+
post-patch:
@${REINPLACE_CMD} \
-e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|; \
Index: multimedia/mencoder/distinfo
===================================================================
--- multimedia/mencoder/distinfo
+++ multimedia/mencoder/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1473848106
-SHA256 (mplayer-1.3.0.20160912.tar.xz) = 8be40d3205c95dbea494ee6250e63a119ee04a785664301b0079e9e97e3c7ec8
-SIZE (mplayer-1.3.0.20160912.tar.xz) = 12736924
+TIMESTAMP = 1482913109
+SHA256 (mplayer-1.3.0.20161228.tar.xz) = 51e7c624ad2db67cd67a6f5ca973fc2509bbcc9310f2e67597011d187f0edbe6
+SIZE (mplayer-1.3.0.20161228.tar.xz) = 5166288
Index: multimedia/mplayer/Makefile
===================================================================
--- multimedia/mplayer/Makefile
+++ multimedia/mplayer/Makefile
@@ -134,6 +134,9 @@
@${ECHO_MSG} "http://www.mplayerhq.hu/"
.endif
+pre-patch:
+ @${LN} -s `cd ${.CURDIR}/../ffmpeg && ${MAKE} -V WRKSRC` ${WRKSRC}/ffmpeg
+
post-patch:
@${REINPLACE_CMD} \
-e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|; \
Index: multimedia/mplayer/Makefile.common
===================================================================
--- multimedia/mplayer/Makefile.common
+++ multimedia/mplayer/Makefile.common
@@ -5,8 +5,8 @@
# $FreeBSD$
MPLAYER_PORT_VERSION= 1.3.0
-MPLAYER_SNAPSHOT_DATE= 2016-09-12
-PORTREVISION?= 3
+MPLAYER_SNAPSHOT_DATE= 2016-12-28
+PORTREVISION?= 0
MASTER_SITES= LOCAL/riggs/mplayer
DISTNAME= mplayer-${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
WRKSRC= ${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE}
@@ -14,7 +14,10 @@
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
+PATCH_DEPENDS= ${NONEXISTENT}:multimedia/ffmpeg:patch
+
LIB_DEPENDS= libpng.so:graphics/png \
+ libavcodec.so:multimedia/ffmpeg \
libfreetype.so:print/freetype2
USES= compiler:c11 gmake iconv ncurses tar:xz
@@ -31,6 +34,7 @@
--disable-crystalhd \
--disable-esd \
--disable-faad \
+ --disable-ffmpeg_a \
--disable-ggi \
--disable-ggiwmh \
--disable-liba52 \
Index: multimedia/mplayer/distinfo
===================================================================
--- multimedia/mplayer/distinfo
+++ multimedia/mplayer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1473836368
-SHA256 (mplayer-1.3.0.20160912.tar.xz) = 8be40d3205c95dbea494ee6250e63a119ee04a785664301b0079e9e97e3c7ec8
-SIZE (mplayer-1.3.0.20160912.tar.xz) = 12736924
+TIMESTAMP = 1482906715
+SHA256 (mplayer-1.3.0.20161228.tar.xz) = 51e7c624ad2db67cd67a6f5ca973fc2509bbcc9310f2e67597011d187f0edbe6
+SIZE (mplayer-1.3.0.20161228.tar.xz) = 5166288
Index: multimedia/mplayer/files/patch-ffmpeg_libavcodec_arm_fft__vfp.S
===================================================================
--- multimedia/mplayer/files/patch-ffmpeg_libavcodec_arm_fft__vfp.S
+++ /dev/null
@@ -1,11 +0,0 @@
---- ffmpeg/libavcodec/arm/fft_vfp.S.orig 2015-06-19 20:44:37 UTC
-+++ ffmpeg/libavcodec/arm/fft_vfp.S
-@@ -33,7 +33,7 @@ function ff_fft_calc_vfp, export=1
- movrel a2, (fft_tab_vfp - 8)
- ldr pc, [a2, ip, lsl #2]
- endfunc
--const fft_tab_vfp, relocate=1
-+const fft_tab_vfp
- .word fft4_vfp
- .word fft8_vfp
- .word X(ff_fft16_vfp) @ this one alone is exported
Index: multimedia/mplayer/files/patch-ffmpeg_libavcodec_libgsmdec.c
===================================================================
--- multimedia/mplayer/files/patch-ffmpeg_libavcodec_libgsmdec.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- ffmpeg/libavcodec/libgsmdec.c.orig 2015-06-19 20:44:39 UTC
-+++ ffmpeg/libavcodec/libgsmdec.c
-@@ -28,11 +28,7 @@
- // The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html
-
- #include "config.h"
--#if HAVE_GSM_H
- #include <gsm.h>
--#else
--#include <gsm/gsm.h>
--#endif
-
- #include "libavutil/channel_layout.h"
- #include "libavutil/common.h"
Index: multimedia/mplayer/files/patch-ffmpeg_libavcodec_libgsmenc.c
===================================================================
--- multimedia/mplayer/files/patch-ffmpeg_libavcodec_libgsmenc.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- ffmpeg/libavcodec/libgsmenc.c.orig 2015-06-19 20:44:39 UTC
-+++ ffmpeg/libavcodec/libgsmenc.c
-@@ -28,11 +28,7 @@
- // The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html
-
- #include "config.h"
--#if HAVE_GSM_H
- #include <gsm.h>
--#else
--#include <gsm/gsm.h>
--#endif
-
- #include "libavutil/common.h"
-
Index: multimedia/mplayer/files/patch-ffmpeg_libavcodec_mpegaudio__parser.c
===================================================================
--- multimedia/mplayer/files/patch-ffmpeg_libavcodec_mpegaudio__parser.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- ffmpeg/libavcodec/mpegaudio_parser.c.orig 2015-06-19 20:44:40 UTC
-+++ ffmpeg/libavcodec/mpegaudio_parser.c
-@@ -84,6 +84,7 @@ static int mpegaudio_parse(AVCodecParser
- avctx->sample_rate= sr;
- avctx->channels = channels;
- s1->duration = frame_size;
-+ avctx->frame_size = frame_size;
- avctx->codec_id = codec_id;
- if (s->no_bitrate || !avctx->bit_rate) {
- s->no_bitrate = 1;
Index: multimedia/mplayer/files/patch-ffmpeg_libavformat_rtsp.c
===================================================================
--- multimedia/mplayer/files/patch-ffmpeg_libavformat_rtsp.c
+++ /dev/null
@@ -1,45 +0,0 @@
---- ffmpeg/libavformat/rtsp.c.orig 2016-08-05 16:20:04 UTC
-+++ ffmpeg/libavformat/rtsp.c
-@@ -1613,7 +1613,12 @@ int ff_rtsp_make_setup_request(AVFormatC
- }
- if (ttl > 0)
- snprintf(optbuf, sizeof(optbuf), "?ttl=%d", ttl);
-- getnameinfo((struct sockaddr*) &addr, sizeof(addr),
-+ getnameinfo((struct sockaddr*) &addr,
-+#if HAVE_STRUCT_SOCKADDR_SA_LEN
-+ ((struct sockaddr*) &addr)->sa_len,
-+#else
-+ sizeof(addr),
-+#endif
- namebuf, sizeof(namebuf), NULL, 0, NI_NUMERICHOST);
- ff_url_join(url, sizeof(url), "rtp", NULL, namebuf,
- port, "%s", optbuf);
-@@ -1829,8 +1834,13 @@ redirect:
- goto fail;
- }
- if (!getpeername(tcp_fd, (struct sockaddr*) &peer, &peer_len)) {
-- getnameinfo((struct sockaddr*) &peer, peer_len, host, sizeof(host),
-- NULL, 0, NI_NUMERICHOST);
-+ getnameinfo((struct sockaddr*) &peer,
-+#if HAVE_STRUCT_SOCKADDR_SA_LEN
-+ ((struct sockaddr*) &peer)->sa_len,
-+#else
-+ peer_len,
-+#endif
-+ host, sizeof(host), NULL, 0, NI_NUMERICHOST);
- }
-
- /* request options supported by the server; this also detects server
-@@ -2309,7 +2319,11 @@ static int sdp_read_header(AVFormatConte
- AVDictionary *opts = map_to_opts(rt);
-
- err = getnameinfo((struct sockaddr*) &rtsp_st->sdp_ip,
-- sizeof(rtsp_st->sdp_ip),
-+#if HAVE_STRUCT_SOCKADDR_SA_LEN
-+ ((struct sockaddr*) &rtsp_st->sdp_ip)->sa_len,
-+#else
-+ sizeof(rtsp_st->sdp_ip),
-+#endif
- namebuf, sizeof(namebuf), NULL, 0, NI_NUMERICHOST);
- if (err) {
- av_log(s, AV_LOG_ERROR, "getnameinfo: %s\n", gai_strerror(err));
Index: multimedia/mplayer/files/patch-ffmpeg_libavformat_udp.c
===================================================================
--- multimedia/mplayer/files/patch-ffmpeg_libavformat_udp.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ffmpeg/libavformat/udp.c.orig 2015-06-19 20:44:53 UTC
-+++ ffmpeg/libavformat/udp.c
-@@ -71,6 +71,8 @@
- #define UDP_MAX_PKT_SIZE 65536
- #define UDP_HEADER_SIZE 8
-
-+#define IPPROTO_IPV6 41
-+
- typedef struct UDPContext {
- const AVClass *class;
- int udp_fd;
Index: multimedia/mplayer/files/patch-ffmpeg_libavutil_mem.c
===================================================================
--- multimedia/mplayer/files/patch-ffmpeg_libavutil_mem.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ffmpeg/libavutil/mem.c.orig 2015-08-23 16:08:16 UTC
-+++ ffmpeg/libavutil/mem.c
-@@ -228,7 +228,7 @@ void av_free(void *ptr)
- #if CONFIG_MEMALIGN_HACK
- if (ptr) {
- int v= ((char *)ptr)[-1];
-- av_assert0(v>0 && v<=ALIGN);
-+ av_assert0(v>=0 && v<=ALIGN);
- free((char *)ptr - v);
- }
- #elif HAVE_ALIGNED_MALLOC
Index: multimedia/mplayer/files/patch-ffmpeg_libavutil_x86_asm.h
===================================================================
--- multimedia/mplayer/files/patch-ffmpeg_libavutil_x86_asm.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ffmpeg/libavutil/x86/asm.h.orig 2015-06-19 20:44:54 UTC
-+++ ffmpeg/libavutil/x86/asm.h
-@@ -71,7 +71,7 @@ typedef int32_t x86_reg;
- typedef int x86_reg;
- #endif
-
--#define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE))
-+#define HAVE_7REGS (ARCH_X86_64)
- #define HAVE_6REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE || HAVE_EBP_AVAILABLE))
-
- #if ARCH_X86_64 && defined(PIC)

File Metadata

Mime Type
text/plain
Expires
Fri, Apr 24, 10:53 PM (11 h, 10 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32095651
Default Alt Text
D8930.id23315.diff (9 KB)

Event Timeline