diff options
author | Jan Beich <jbeich@FreeBSD.org> | 2016-12-19 01:08:06 +0000 |
---|---|---|
committer | Jan Beich <jbeich@FreeBSD.org> | 2016-12-19 01:08:06 +0000 |
commit | 59f9038ec5fed2ca31ceb5004e26ac79c1e5d577 (patch) | |
tree | d64072681bafd068a11aa7d9c44cce338486b465 /multimedia/ffmpeg | |
parent | 22745f1be98e0d84682cbdac987e32b7fb623f2e (diff) | |
download | ports-59f9038ec5fed2ca31ceb5004e26ac79c1e5d577.tar.gz ports-59f9038ec5fed2ca31ceb5004e26ac79c1e5d577.zip |
Notes
Diffstat (limited to 'multimedia/ffmpeg')
-rw-r--r-- | multimedia/ffmpeg/Makefile | 20 | ||||
-rw-r--r-- | multimedia/ffmpeg/files/patch-libavdevice-bktr.c | 14 | ||||
-rw-r--r-- | multimedia/ffmpeg/files/patch-libavdevice-oss.c | 14 | ||||
-rw-r--r-- | multimedia/ffmpeg/files/patch-libavformat-udp.c | 11 |
4 files changed, 0 insertions, 59 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 7e988dab2f06..3cd6fc9692e4 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -469,29 +469,9 @@ post-patch: @${REINPLACE_CMD} -e 's|/etc/ffserver.conf|${PREFIX}/etc/ffserver.conf|' \ ${WRKSRC}/ffserver.c @${REINPLACE_CMD} -E \ - -e "s|(EXTRALIBS[[:space:]]*=)|\1-L${LOCALBASE}/lib |g; \ - s|%%LOCALBASE%%|${LOCALBASE}|g; \ - s|gsm/gsm.h|gsm.h|g" \ - ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} - @${REINPLACE_CMD} -e 's|-ldl||' \ -e 's|require_pkg_config opencv|require_pkg_config opencv-core|g' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} -post-patch-SDL-on: - @${REINPLACE_CMD} -E \ - -e 's|sdl-config|${SDL_CONFIG}|g' \ - ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} - @${REINPLACE_CMD} -E \ - -e 's|#include <SDL|#include <SDL2/SDL|' \ - ${WRKSRC}/ffplay.c \ - ${WRKSRC}/libavdevice/opengl_enc.c \ - ${WRKSRC}/libavdevice/sdl2.c - -post-configure-THEORA-off: - @${REINPLACE_CMD} -E \ - -e 's|^(CONFIG_LIBTHEORA).*$$|\1=no|' \ - ${WRKSRC}/config.mak - post-install: (cd ${WRKSRC} && ${COPYTREE_SHARE} \ "${DOC_FILES}" ${STAGEDIR}${DOCSDIR}) diff --git a/multimedia/ffmpeg/files/patch-libavdevice-bktr.c b/multimedia/ffmpeg/files/patch-libavdevice-bktr.c deleted file mode 100644 index 325d4b620f40..000000000000 --- a/multimedia/ffmpeg/files/patch-libavdevice-bktr.c +++ /dev/null @@ -1,14 +0,0 @@ ---- libavdevice/bktr.c.orig 2015-06-19 20:44:50 UTC -+++ libavdevice/bktr.c -@@ -24,6 +24,11 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -+typedef unsigned char u_char; -+typedef unsigned short u_short; -+typedef unsigned int u_int; -+typedef unsigned long u_long; -+ - #include "libavformat/internal.h" - #include "libavutil/internal.h" - #include "libavutil/log.h" diff --git a/multimedia/ffmpeg/files/patch-libavdevice-oss.c b/multimedia/ffmpeg/files/patch-libavdevice-oss.c deleted file mode 100644 index 863b590854e6..000000000000 --- a/multimedia/ffmpeg/files/patch-libavdevice-oss.c +++ /dev/null @@ -1,14 +0,0 @@ ---- libavdevice/oss.c.orig 2015-06-19 20:44:50 UTC -+++ libavdevice/oss.c -@@ -19,6 +19,11 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -+typedef unsigned char u_char; -+typedef unsigned short u_short; -+typedef unsigned int u_int; -+typedef unsigned long u_long; -+ - #include "config.h" - - #include <string.h> diff --git a/multimedia/ffmpeg/files/patch-libavformat-udp.c b/multimedia/ffmpeg/files/patch-libavformat-udp.c deleted file mode 100644 index 5f8746cfc0f9..000000000000 --- a/multimedia/ffmpeg/files/patch-libavformat-udp.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libavformat/udp.c.orig 2015-06-19 20:44:53 UTC -+++ 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; |