From cb616444399431f8d59fba35ff3a59cfe2254cdc Mon Sep 17 00:00:00 2001 From: wiz Date: Mon, 17 Apr 2017 08:40:56 +0000 Subject: Install more tools, headers and libraries, as well as the mpeg4ip-config script. Fix a fpos_t cast on NetBSD in the installed header file. Bump PKGREVISION. --- multimedia/libmp4v2/Makefile | 11 +++-- multimedia/libmp4v2/PLIST | 90 +++++++++++++++++++++++++++++++++++- multimedia/libmp4v2/distinfo | 4 +- multimedia/libmp4v2/patches/patch-ae | 15 +++++- 4 files changed, 111 insertions(+), 9 deletions(-) (limited to 'multimedia') diff --git a/multimedia/libmp4v2/Makefile b/multimedia/libmp4v2/Makefile index 26a2e5fa351..3386668a54e 100644 --- a/multimedia/libmp4v2/Makefile +++ b/multimedia/libmp4v2/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.11 2012/12/03 22:26:17 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2017/04/17 08:40:56 wiz Exp $ DISTNAME= mpeg4ip-1.6.1 PKGNAME= libmp4v2-1.6.1 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= multimedia # distfile at sf is corrupt #MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mpeg4ip/} @@ -26,10 +26,13 @@ CONFIGURE_ARGS+= USENASM=no # (unused by libmp4v2 build) OVERRIDE_DIRDEPTH= 3 -BUILD_DIRS= lib/mp4v2 -INSTALL_DIRS+= lib/mp4v2 doc/mp4v2 +# to install mp4* tools +BUILD_DIRS= . lib/mp4v2/util + +BUILDLINK_TRANSFORM+= rm:-Werror pre-configure: ${TOUCH} ${WRKSRC}/bootstrapped +.include "../../devel/SDL/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/libmp4v2/PLIST b/multimedia/libmp4v2/PLIST index 92839d892c3..40facd5796f 100644 --- a/multimedia/libmp4v2/PLIST +++ b/multimedia/libmp4v2/PLIST @@ -1,6 +1,94 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2007/02/09 19:57:48 drochner Exp $ +@comment $NetBSD: PLIST,v 1.2 2017/04/17 08:40:56 wiz Exp $ +bin/avi2raw +bin/avidump +bin/h264_parse +bin/lboxcrop +bin/mp4art +bin/mp4creator +bin/mp4dump +bin/mp4extract +bin/mp4info +bin/mp4player +bin/mp4tags +bin/mp4trackdump +bin/mp4videoinfo +bin/mpeg2t_dump +bin/mpeg2video_parse +bin/mpeg4ip-config +bin/mpeg4vol +bin/mpeg_ps_extract +bin/mpeg_ps_info +bin/rgb2yuv +bin/sdl_pcm_play +bin/yuvdump +include/codec_plugin.h +include/h264_sdp.h include/mp4.h +include/mp4av.h +include/mp4av_aac.h +include/mp4av_ac3.h +include/mp4av_adts.h +include/mp4av_amr.h +include/mp4av_audio.h +include/mp4av_h264.h +include/mp4av_hinters.h +include/mp4av_mp3.h +include/mp4av_mpeg3.h +include/mp4av_mpeg4.h +include/mpeg4_audio_config.h +include/mpeg4_sdp.h +include/mpeg4ip.h +include/mpeg4ip_bitstream.h +include/mpeg4ip_byteswap.h +include/mpeg4ip_config.h +include/mpeg4ip_config_set.h +include/mpeg4ip_getopt.h +include/mpeg4ip_version.h +include/rtp_plugin.h +include/sdp.h +include/sdp_error.h +include/text_plugin.h +lib/libhttp.la +lib/libismacryp.la +lib/libmp4.la +lib/libmp4av.la +lib/libmp4util.la lib/libmp4v2.la +lib/libmpeg4ipSDL.la +lib/libmpeg4ip_celp.la +lib/libmpeg4ip_celpbs.la +lib/libmpeg4ip_faad.la +lib/libmpeg4ip_ffmpeg.la +lib/libmpeg4ip_fposrec.la +lib/libmpeg4ip_gnu.la +lib/libmpeg4ip_mpeg4_iso.la +lib/libmsg_queue.la +lib/libsdp.la +lib/libsrtpif.la +lib/mp4player_plugin/aac_plugin.la +lib/mp4player_plugin/celp_plugin.la +lib/mp4player_plugin/g711_audio_plugin.la +lib/mp4player_plugin/h261_plugin.la +lib/mp4player_plugin/h261_rtp_plugin.la +lib/mp4player_plugin/h264_rtp_plugin.la +lib/mp4player_plugin/href_rtp_plugin.la +lib/mp4player_plugin/href_text_plugin.la +lib/mp4player_plugin/isma_enc_rtp_plugin.la +lib/mp4player_plugin/isma_enc_video_rtp_plugin.la +lib/mp4player_plugin/isma_rtp_plugin.la +lib/mp4player_plugin/latm_rtp_plugin.la +lib/mp4player_plugin/mp3_plugin.la +lib/mp4player_plugin/mpeg4_iso_plugin.la +lib/mp4player_plugin/plaintext_text_plugin.la +lib/mp4player_plugin/raw_audio_plugin.la +lib/mp4player_plugin/raw_video_plugin.la +lib/mp4player_plugin/rfc2429_rtp_plugin.la +lib/mp4player_plugin/rfc3267_plugin.la +lib/mp4player_plugin/wav_plugin.la +man/man1/gmp4player.1 +man/man1/mp4creator.1 +man/man1/mp4encode.1 +man/man1/mp4live.1 man/man3/MP4.3 man/man3/MP4AddAudioTrack.3 man/man3/MP4AddHintTrack.3 diff --git a/multimedia/libmp4v2/distinfo b/multimedia/libmp4v2/distinfo index 4172faf3c9d..12de536d87b 100644 --- a/multimedia/libmp4v2/distinfo +++ b/multimedia/libmp4v2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2015/11/03 23:54:29 agc Exp $ +$NetBSD: distinfo,v 1.13 2017/04/17 08:40:56 wiz Exp $ SHA1 (mpeg4ip-1.6.1.tar.gz) = 2af97fc0da6a5c0bcb7b433c6715967487b80e38 RMD160 (mpeg4ip-1.6.1.tar.gz) = ee8375d9581cccbbf685f730bb36f3866eaf12f7 @@ -8,7 +8,7 @@ SHA1 (patch-aa) = d2bcba203cd373f02f9e7c6e45daf4c29c0b2c3a SHA1 (patch-ab) = ddf8650416757f161f156b0928062d39eae7fe3e SHA1 (patch-ac) = 9e4683fdbbfa3b85941243547773814ea50125a9 SHA1 (patch-ad) = e5dd062d7f17230bf27ffde0fc2db72d8357fd56 -SHA1 (patch-ae) = 9b01cadd24e03cfc1e65968d8d536e474bfec992 +SHA1 (patch-ae) = 232d380e2d65577f6e53dac0d52b167d80ccb067 SHA1 (patch-af) = a69e136fbe8db5ae844c90ae5e2f06e86bf2ed85 SHA1 (patch-ag) = 76ec743b051ef39e4edb211a15a2accbf491d0b1 SHA1 (patch-ah) = b5db1d879cf790c2b9c7e9132b14e1fc59e9cb4d diff --git a/multimedia/libmp4v2/patches/patch-ae b/multimedia/libmp4v2/patches/patch-ae index 0d231e1ad2b..85fec75be96 100644 --- a/multimedia/libmp4v2/patches/patch-ae +++ b/multimedia/libmp4v2/patches/patch-ae @@ -1,6 +1,7 @@ -$NetBSD: patch-ae,v 1.2 2011/01/29 21:00:45 markd Exp $ +$NetBSD: patch-ae,v 1.3 2017/04/17 08:40:56 wiz Exp $ let declare strcasestr() correctly +Fix fpos_t cast on NetBSD (_pos vs. __pos) --- include/mpeg4ip.h.orig 2006-08-07 18:27:00.000000000 +0000 +++ include/mpeg4ip.h @@ -19,7 +20,17 @@ let declare strcasestr() correctly #define OPEN_RDWR O_RDWR #define OPEN_CREAT O_CREAT #define OPEN_RDONLY O_RDONLY -@@ -233,7 +225,8 @@ char *strsep(char **strp, const char *de +@@ -156,6 +148,9 @@ char *strcasestr(const char *haystack, c + #ifdef HAVE_FPOS_T___POS + #define FPOS_TO_VAR(fpos, typed, var) (var) = (typed)((fpos).__pos) + #define VAR_TO_FPOS(fpos, var) (fpos).__pos = (var) ++#elif defined(__NetBSD__) ++#define FPOS_TO_VAR(fpos, typed, var) (var) = (typed)((fpos)._pos) ++#define VAR_TO_FPOS(fpos, var) (fpos)._pos = (var) + #else + #define FPOS_TO_VAR(fpos, typed, var) (var) = (typed)(fpos) + #define VAR_TO_FPOS(fpos, var) (fpos) = (var) +@@ -233,7 +228,8 @@ char *strsep(char **strp, const char *de #define ADV_SPACE(a) {while (isspace(*(a)) && (*(a) != '\0'))(a)++;} -- cgit v1.2.3