CVS commit: pkgsrc

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Apr 17 08:48:01 UTC 2017

Modified Files:
        pkgsrc/doc: CHANGES-2017 TODO
        pkgsrc/mk/defaults: options.description
        pkgsrc/multimedia: Makefile
        pkgsrc/multimedia/libmp4v2: Makefile
        pkgsrc/multimedia/mp4v2: Makefile
Removed Files:
        pkgsrc/multimedia/mpeg4ip: DESCR Makefile PLIST buildlink3.mk distinfo
        pkgsrc/multimedia/mpeg4ip/patches: patch-aa patch-ac patch-ad patch-ae
            patch-af patch-ag patch-ah patch-ai patch-aj patch-ak patch-al
            patch-am patch-common_video_iso-mpeg4_include_bitstrm_hpp
            patch-common_video_iso-mpeg4_include_entropy_hpp
            patch-common_video_iso-mpeg4_src_sys__encoder__errenc_cpp
            patch-common_video_iso-mpeg4_src_sys__encoder__gmc__enc__util_cpp
            patch-common_video_iso-mpeg4_src_sys__encoder__mbenc_cpp
            patch-common_video_iso-mpeg4_src_sys__encoder__mbinterlace_cpp
            patch-common_video_iso-mpeg4_src_sys__encoder__mcenc_cpp
            patch-common_video_iso-mpeg4_src_sys__encoder__motest_cpp
            patch-common_video_iso-mpeg4_src_sys__encoder__mvenc_cpp
            patch-common_video_iso-mpeg4_src_sys__encoder__padenc_cpp
            patch-common_video_iso-mpeg4_src_sys__encoder__sptenc_cpp
            patch-common_video_iso-mpeg4_src_sys__encoder__tm5rc_cpp
            patch-common_video_iso-mpeg4_src_sys__encoder__vopmbenc_cpp
            patch-common_video_iso-mpeg4_src_sys__error_cpp
            patch-common_video_iso-mpeg4_src_sys__mode_cpp
            patch-common_video_iso-mpeg4_src_sys__rrv_cpp
            patch-common_video_iso-mpeg4_src_sys__tps__enhcbuf_cpp
            patch-common_video_iso-mpeg4_src_tools__entropy__bitstrm_cpp
            patch-common_video_iso-mpeg4_src_tools__entropy__huffman_cpp
            patch-common_video_iso-mpeg4_src_tools__sadct__sadct_cpp
            patch-common_video_iso-mpeg4_src_type__yuvac_cpp
            patch-common_video_iso-mpeg4_src_type__yuvai_cpp
            patch-common_video_iso-mpeg4_src_vtc__main__vtcenc_cpp
            patch-configure.in patch-lib_mp4_ctts.c patch-lib_mp4_hinthnti.c
            patch-lib_mp4_hintudta.c patch-lib_mp4_hnti.c patch-lib_mp4_moov.c
            patch-lib_mp4_rtp.c patch-lib_mp4_sdp.c patch-lib_mp4_stbl.c
            patch-lib_mp4_trak.c patch-lib_mp4_tref.c patch-lib_mp4_udta.c
            patch-player_lib_audio_faad_all.h

Log Message:
Remove mpeg4ip, unused in pkgsrc, newer version in multimedia/libmp4v2.


To generate a diff of this commit:
cvs rdiff -u -r1.1595 -r1.1596 pkgsrc/doc/CHANGES-2017
cvs rdiff -u -r1.17248 -r1.17249 pkgsrc/doc/TODO
cvs rdiff -u -r1.527 -r1.528 pkgsrc/mk/defaults/options.description
cvs rdiff -u -r1.257 -r1.258 pkgsrc/multimedia/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/multimedia/libmp4v2/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/mp4v2/Makefile
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/multimedia/mpeg4ip/DESCR
cvs rdiff -u -r1.21 -r0 pkgsrc/multimedia/mpeg4ip/Makefile
cvs rdiff -u -r1.6 -r0 pkgsrc/multimedia/mpeg4ip/PLIST
cvs rdiff -u -r1.4 -r0 pkgsrc/multimedia/mpeg4ip/buildlink3.mk
cvs rdiff -u -r1.19 -r0 pkgsrc/multimedia/mpeg4ip/distinfo
cvs rdiff -u -r1.3 -r0 pkgsrc/multimedia/mpeg4ip/patches/patch-aa
cvs rdiff -u -r1.1 -r0 pkgsrc/multimedia/mpeg4ip/patches/patch-ac \
    pkgsrc/multimedia/mpeg4ip/patches/patch-ad \
    pkgsrc/multimedia/mpeg4ip/patches/patch-af \
    pkgsrc/multimedia/mpeg4ip/patches/patch-ag \
    pkgsrc/multimedia/mpeg4ip/patches/patch-ah \
    pkgsrc/multimedia/mpeg4ip/patches/patch-ai \
    pkgsrc/multimedia/mpeg4ip/patches/patch-aj \
    pkgsrc/multimedia/mpeg4ip/patches/patch-ak \
    pkgsrc/multimedia/mpeg4ip/patches/patch-al \
    pkgsrc/multimedia/mpeg4ip/patches/patch-am \
    pkgsrc/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_include_bitstrm_hpp \
    pkgsrc/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_include_entropy_hpp \
    pkgsrc/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__errenc_cpp \
    pkgsrc/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__gmc__enc__util_cpp \
    pkgsrc/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__mbenc_cpp \
    pkgsrc/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__mbinterlace_cpp \
    pkgsrc/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__mcenc_cpp \
    pkgsrc/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__motest_cpp \
    pkgsrc/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__mvenc_cpp \
    pkgsrc/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__padenc_cpp \
    pkgsrc/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__sptenc_cpp \
    pkgsrc/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__tm5rc_cpp \
    pkgsrc/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__encoder__vopmbenc_cpp \
    pkgsrc/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__error_cpp \
    pkgsrc/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__mode_cpp \
    pkgsrc/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__rrv_cpp \
    pkgsrc/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_sys__tps__enhcbuf_cpp \
    pkgsrc/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_tools__entropy__bitstrm_cpp \
    pkgsrc/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_tools__entropy__huffman_cpp \
    pkgsrc/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_tools__sadct__sadct_cpp \
    pkgsrc/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_type__yuvac_cpp \
    pkgsrc/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_type__yuvai_cpp \
    pkgsrc/multimedia/mpeg4ip/patches/patch-common_video_iso-mpeg4_src_vtc__main__vtcenc_cpp \
    pkgsrc/multimedia/mpeg4ip/patches/patch-configure.in \
    pkgsrc/multimedia/mpeg4ip/patches/patch-lib_mp4_ctts.c \
    pkgsrc/multimedia/mpeg4ip/patches/patch-lib_mp4_hinthnti.c \
    pkgsrc/multimedia/mpeg4ip/patches/patch-lib_mp4_hintudta.c \
    pkgsrc/multimedia/mpeg4ip/patches/patch-lib_mp4_hnti.c \
    pkgsrc/multimedia/mpeg4ip/patches/patch-lib_mp4_moov.c \
    pkgsrc/multimedia/mpeg4ip/patches/patch-lib_mp4_rtp.c \
    pkgsrc/multimedia/mpeg4ip/patches/patch-lib_mp4_sdp.c \
    pkgsrc/multimedia/mpeg4ip/patches/patch-lib_mp4_stbl.c \
    pkgsrc/multimedia/mpeg4ip/patches/patch-lib_mp4_trak.c \
    pkgsrc/multimedia/mpeg4ip/patches/patch-lib_mp4_tref.c \
    pkgsrc/multimedia/mpeg4ip/patches/patch-lib_mp4_udta.c \
    pkgsrc/multimedia/mpeg4ip/patches/patch-player_lib_audio_faad_all.h
cvs rdiff -u -r1.2 -r0 pkgsrc/multimedia/mpeg4ip/patches/patch-ae

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/doc/CHANGES-2017
diff -u pkgsrc/doc/CHANGES-2017:1.1595 pkgsrc/doc/CHANGES-2017:1.1596
--- pkgsrc/doc/CHANGES-2017:1.1595      Mon Apr 17 08:41:41 2017
+++ pkgsrc/doc/CHANGES-2017     Mon Apr 17 08:48:01 2017
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2017,v 1.1595 2017/04/17 08:41:41 wiz Exp $
+$NetBSD: CHANGES-2017,v 1.1596 2017/04/17 08:48:01 wiz Exp $
 
 Changes to the packages collection and infrastructure in 2017:
 
@@ -1984,3 +1984,4 @@ Changes to the packages collection and i
        Updated x11/libdrm to 2.4.80 [wiz 2017-04-17]
        Updated multimedia/libmp4v2 to 1.6.1nb4 [wiz 2017-04-17]
        Updated multimedia/fuppes to 0.660nb33 [wiz 2017-04-17]
+       Removed multimedia/mpeg4ip successor multimedia/libmp4v2 [wiz 2017-04-17]

Index: pkgsrc/doc/TODO
diff -u pkgsrc/doc/TODO:1.17248 pkgsrc/doc/TODO:1.17249
--- pkgsrc/doc/TODO:1.17248     Mon Apr 17 07:28:46 2017
+++ pkgsrc/doc/TODO     Mon Apr 17 08:48:01 2017
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.17248 2017/04/17 07:28:46 wiz Exp $
+$NetBSD: TODO,v 1.17249 2017/04/17 08:48:01 wiz Exp $
 
 Suggested new packages
 ======================
@@ -1085,7 +1085,6 @@ For possible Perl packages updates, see 
        o mp3splt-2.6.2
        o mp3splt-gtk-0.9.0
        o mpdas-0.4.1
-       o mpeg4ip-1.6.1
        o mserv-devel-0.41
        o msgpack-1.4.1 [pkg/51083]
        o multitail-6.4.2

Index: pkgsrc/mk/defaults/options.description
diff -u pkgsrc/mk/defaults/options.description:1.527 pkgsrc/mk/defaults/options.description:1.528
--- pkgsrc/mk/defaults/options.description:1.527        Sun Apr  9 13:02:32 2017
+++ pkgsrc/mk/defaults/options.description      Mon Apr 17 08:48:00 2017
@@ -497,7 +497,6 @@ mp3tunes            Enable support for mp3tunes.co
 mp4v2                  Enable MP4 support using mp4v2.
 mpcdec                 Enable Musepack decoder library support.
 mpeg3                  Enable libmpeg3 MPEG decoding library support.
-mpeg4ip                        Enable mpeg4ip support.
 mpg123                 Enable MP3 support using mpg123.
 mpg123-altivec         Enable altivec optimized dithering code.
 mpg123-fifo            Enable FIFO support for the mpg123 control interface.

Index: pkgsrc/multimedia/Makefile
diff -u pkgsrc/multimedia/Makefile:1.257 pkgsrc/multimedia/Makefile:1.258
--- pkgsrc/multimedia/Makefile:1.257    Fri Apr 14 13:56:07 2017
+++ pkgsrc/multimedia/Makefile  Mon Apr 17 08:48:01 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.257 2017/04/14 13:56:07 leot Exp $
+# $NetBSD: Makefile,v 1.258 2017/04/17 08:48:01 wiz Exp $
 #
 
 COMMENT=       Multimedia utilities
@@ -153,7 +153,6 @@ SUBDIR+=    mkvtoolnix-old
 SUBDIR+=       mlt
 SUBDIR+=       mp4v2
 SUBDIR+=       mpeg-lib
-SUBDIR+=       mpeg4ip
 SUBDIR+=       mpeg_encode
 SUBDIR+=       mpeg_play
 SUBDIR+=       mplayer

Index: pkgsrc/multimedia/libmp4v2/Makefile
diff -u pkgsrc/multimedia/libmp4v2/Makefile:1.12 pkgsrc/multimedia/libmp4v2/Makefile:1.13
--- pkgsrc/multimedia/libmp4v2/Makefile:1.12    Mon Apr 17 08:40:56 2017
+++ pkgsrc/multimedia/libmp4v2/Makefile Mon Apr 17 08:48:01 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2017/04/17 08:40:56 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2017/04/17 08:48:01 wiz Exp $
 
 DISTNAME=              mpeg4ip-1.6.1
 PKGNAME=               libmp4v2-1.6.1
@@ -12,8 +12,6 @@ MAINTAINER=           pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://mpeg4ip.sourceforge.net/
 COMMENT=               Library for reading and modifying mp4 files
 
-CONFLICTS+=            mpeg4ip<1.5.0.1 mp4v2-[0-9]*
-
 USE_LANGUAGES=         c c++
 USE_PKGLOCALEDIR=      yes
 USE_LIBTOOL=           yes

Index: pkgsrc/multimedia/mp4v2/Makefile
diff -u pkgsrc/multimedia/mp4v2/Makefile:1.1 pkgsrc/multimedia/mp4v2/Makefile:1.2
--- pkgsrc/multimedia/mp4v2/Makefile:1.1        Mon Dec  3 22:26:09 2012
+++ pkgsrc/multimedia/mp4v2/Makefile    Mon Apr 17 08:48:01 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2012/12/03 22:26:09 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2017/04/17 08:48:01 wiz Exp $
 
 DISTNAME=              mp4v2-2.0.0
 CATEGORIES=            multimedia
@@ -10,8 +10,6 @@ HOMEPAGE=             http://code.google.com/p/mp4v
 COMMENT=               Library for reading and modifying mp4 files
 LICENSE=               mpl-1.1
 
-CONFLICTS+=            mpeg4ip<1.5.0.1 libmp4v2-[0-9]*
-
 USE_LANGUAGES=         c c++
 USE_TOOLS+=            gmake
 USE_PKGLOCALEDIR=      yes