[pkgsrc/trunk]: pkgsrc Split libdv into two packages: libdv itself, which ins...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Split libdv into two packages: libdv itself, which ins...
From: jmmv <jmmv%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 01:54:54 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/25ad68c0727b
branches:  trunk
changeset: 495164:25ad68c0727b
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Fri Jun 03 15:40:30 2005 +0000

description:
Split libdv into two packages: libdv itself, which installs only the codec
library, and libdv-tools, which installs all the associated tools.
While doing this, clean-up useless dependencies in libdv's buildlink3.mk
file.

The main purpose of this change is to let mplayer use the dv codec (which
is the default setting) while not depending on unused packages (gtk+).

diffstat:

 doc/CHANGES                       |   4 ++-
 multimedia/Makefile               |   3 +-
 multimedia/libdv-tools/DESCR      |  11 ++++++++
 multimedia/libdv-tools/Makefile   |  19 ++++++++++++++
 multimedia/libdv-tools/PLIST      |   9 ++++++
 multimedia/libdv/DESCR            |   6 ----
 multimedia/libdv/Makefile         |  37 +++------------------------
 multimedia/libdv/Makefile.common  |  38 +++++++++++++++++++++++++++++
 multimedia/libdv/PLIST            |  10 +------
 multimedia/libdv/buildlink3.mk    |   8 +-----
 multimedia/libdv/distinfo         |   4 ++-
 multimedia/libdv/patches/patch-ab |  51 +++++++++++++++++++++++++++++++++++++++
 multimedia/libdv/patches/patch-ac |  22 ++++++++++++++++
 13 files changed, 165 insertions(+), 57 deletions(-)

diffs (truncated from 316 to 300 lines):

diff -r d11af44e1f42 -r 25ad68c0727b doc/CHANGES
--- a/doc/CHANGES       Fri Jun 03 14:41:19 2005 +0000
+++ b/doc/CHANGES       Fri Jun 03 15:40:30 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.10284 2005/06/02 23:33:33 tron Exp $
+$NetBSD: CHANGES,v 1.10285 2005/06/03 15:40:30 jmmv Exp $
 
 Changes to the packages collection and infrastructure in 2005:
        
@@ -2772,3 +2772,5 @@
        Added sysutils/afbinit version 1.0 [martin 2005-06-02]
        Updated parallel/clusterit to 2.3.1 [garbled 2005-06-02]
        Updated chat/xchat2 to 2.4.3 [tron 2005-06-02]
+       Updated multimedia/libdv to 0.104nb1 [jmmv 2005-06-03]
+       Added multimedia/libdv-tools version 0.104 [jmmv 2005-06-03]
diff -r d11af44e1f42 -r 25ad68c0727b multimedia/Makefile
--- a/multimedia/Makefile       Fri Jun 03 14:41:19 2005 +0000
+++ b/multimedia/Makefile       Fri Jun 03 15:40:30 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2005/05/18 22:02:17 wiz Exp $
+# $NetBSD: Makefile,v 1.70 2005/06/03 15:40:30 jmmv Exp $
 #
 
 COMMENT=       Multimedia utilities
@@ -31,6 +31,7 @@
 SUBDIR+=       kmplayer
 SUBDIR+=       libassetml
 SUBDIR+=       libdv
+SUBDIR+=       libdv-tools
 SUBDIR+=       libdvbpsi
 SUBDIR+=       libdvdcss
 SUBDIR+=       libdvdnav
diff -r d11af44e1f42 -r 25ad68c0727b multimedia/libdv-tools/DESCR
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/libdv-tools/DESCR      Fri Jun 03 15:40:30 2005 +0000
@@ -0,0 +1,11 @@
+The Quasar DV codec (libdv) is a software codec for DV video, the encoding
+format used by most digital camcorders, typically those that support
+the IEEE 1394 (a.k.a. FireWire or i.Link) interface. libdv was developed
+according to the official standards for DV video: IEC 61834 and SMPTE
+314M.
+
+This package provides playdv for displaying DV-encoded video data,
+dubdv for inserting audio into a digital video stream, encodedv for
+encoding a series of images to a digital video stream, and dvconnect
+for capturing and sending raw DV streams using the Linux IEEE 1394
+video1394 device.
diff -r d11af44e1f42 -r 25ad68c0727b multimedia/libdv-tools/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/libdv-tools/Makefile   Fri Jun 03 15:40:30 2005 +0000
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1 2005/06/03 15:40:31 jmmv Exp $
+
+.include "../../multimedia/libdv/Makefile.common"
+
+PKGNAME=               ${DISTNAME:S/-/-tools-/}
+
+COMMENT+=              (standalone tools)
+
+CONFIGURE_ARGS:=       ${CONFIGURE_ARGS:S/--disable-gtk/--enable-gtk/g}
+
+BUILD_DIRS=            ${WRKSRC}/encodedv ${WRKSRC}/playdv
+INSTALL_DIRS=          ${WRKSRC}/encodedv ${WRKSRC}/playdv
+
+BUILDLINK_DEPENDS.libdv+=      libdv>=0.104nb1
+
+.include "../../devel/glib/buildlink3.mk"
+.include "../../multimedia/libdv/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff -r d11af44e1f42 -r 25ad68c0727b multimedia/libdv-tools/PLIST
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/libdv-tools/PLIST      Fri Jun 03 15:40:30 2005 +0000
@@ -0,0 +1,9 @@
+@comment $NetBSD: PLIST,v 1.1 2005/06/03 15:40:31 jmmv Exp $
+bin/dubdv
+bin/dvconnect
+bin/encodedv
+bin/playdv
+man/man1/dubdv.1
+man/man1/dvconnect.1
+man/man1/encodedv.1
+man/man1/playdv.1
diff -r d11af44e1f42 -r 25ad68c0727b multimedia/libdv/DESCR
--- a/multimedia/libdv/DESCR    Fri Jun 03 14:41:19 2005 +0000
+++ b/multimedia/libdv/DESCR    Fri Jun 03 15:40:30 2005 +0000
@@ -3,9 +3,3 @@
 the IEEE 1394 (a.k.a. FireWire or i.Link) interface. libdv was developed
 according to the official standards for DV video: IEC 61834 and SMPTE
 314M.
-
-This package also includes playdv for displaying DV-encoded video data,
-dubdv for inserting audio into a digital video stream, encodedv for
-encoding a series of images to a digital video stream, and dvconnect
-for capturing and sending raw DV streams using the Linux IEEE 1394
-video1394 device.
diff -r d11af44e1f42 -r 25ad68c0727b multimedia/libdv/Makefile
--- a/multimedia/libdv/Makefile Fri Jun 03 14:41:19 2005 +0000
+++ b/multimedia/libdv/Makefile Fri Jun 03 15:40:30 2005 +0000
@@ -1,36 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:46:41 tv Exp $
-
-DISTNAME=      libdv-0.104
-CATEGORIES=    multimedia
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=libdv/}
+# $NetBSD: Makefile,v 1.11 2005/06/03 15:40:30 jmmv Exp $
 
-MAINTAINER=    tech-pkg-ja%jp.NetBSD.org@localhost
-HOMEPAGE=      http://libdv.sourceforge.net/
-COMMENT=       DV video codec library
-
-USE_LANGUAGES=         c c++
-USE_LIBTOOL=           yes
-GNU_CONFIGURE=         yes
-PKGCONFIG_OVERRIDE=    ${WRKSRC}/libdv.pc.in
-PTHREAD_AUTO_VARS=     yes
-
-LIBS+=                 ${LIBOSSAUDIO}
+.include "Makefile.common"
 
-.include "../../mk/bsd.prefs.mk"
-.if empty(MACHINE_PLATFORM:M*-*-i386)
-CONFIGURE_ARGS+=       --disable-asm
-.endif
-
-.if !exists(${X11BASE}/include/X11/extensions/Xvlib.h)
-CONFIGURE_ARGS+=--disable-xv
-.endif
+PKGREVISION=   1
 
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib/buildlink3.mk"
-.include "../../devel/pkgconfig/buildlink3.mk"
-.include "../../devel/popt/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
+MAKE_FLAGS+=   SUBDIRS=libdv
+
 .include "../../mk/bsd.pkg.mk"
diff -r d11af44e1f42 -r 25ad68c0727b multimedia/libdv/Makefile.common
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/libdv/Makefile.common  Fri Jun 03 15:40:30 2005 +0000
@@ -0,0 +1,38 @@
+# $NetBSD: Makefile.common,v 1.1 2005/06/03 15:40:31 jmmv Exp $
+
+DISTNAME=      libdv-0.104
+CATEGORIES=    multimedia
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=libdv/}
+
+MAINTAINER=    tech-pkg-ja%jp.NetBSD.org@localhost
+HOMEPAGE=      http://libdv.sourceforge.net/
+COMMENT=       DV video codec library
+
+DISTINFO_FILE=         ${.CURDIR}/../../multimedia/libdv/distinfo
+PATCHDIR=              ${.CURDIR}/../../multimedia/libdv/patches
+
+GNU_CONFIGURE=         yes
+USE_LANGUAGES=         c c++
+USE_LIBTOOL=           yes
+PKGCONFIG_OVERRIDE=    ${WRKSRC}/libdv.pc.in
+PTHREAD_AUTO_VARS=     yes
+
+CONFIGURE_ARGS+=       --disable-gtk
+
+.include "../../mk/bsd.prefs.mk"
+.if empty(MACHINE_PLATFORM:M*-*-i386)
+CONFIGURE_ARGS+=       --disable-asm
+.endif
+
+.if !exists(${X11BASE}/include/X11/extensions/Xvlib.h)
+CONFIGURE_ARGS+=       --disable-xv
+.endif
+
+LIBS+=         ${LIBOSSAUDIO}
+
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/popt/buildlink3.mk"
+.include "../../mk/ossaudio.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
diff -r d11af44e1f42 -r 25ad68c0727b multimedia/libdv/PLIST
--- a/multimedia/libdv/PLIST    Fri Jun 03 14:41:19 2005 +0000
+++ b/multimedia/libdv/PLIST    Fri Jun 03 15:40:30 2005 +0000
@@ -1,14 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2004/11/25 14:52:20 adam Exp $
-bin/dubdv
-bin/dvconnect
-bin/encodedv
-bin/playdv
+@comment $NetBSD: PLIST,v 1.4 2005/06/03 15:40:31 jmmv Exp $
 include/libdv/dv.h
 include/libdv/dv_types.h
 lib/libdv.la
 lib/pkgconfig/libdv.pc
-man/man1/dubdv.1
-man/man1/dvconnect.1
-man/man1/encodedv.1
-man/man1/playdv.1
 @dirrm include/libdv
diff -r d11af44e1f42 -r 25ad68c0727b multimedia/libdv/buildlink3.mk
--- a/multimedia/libdv/buildlink3.mk    Fri Jun 03 14:41:19 2005 +0000
+++ b/multimedia/libdv/buildlink3.mk    Fri Jun 03 15:40:30 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:02 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2005/06/03 15:40:31 jmmv Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 LIBDV_BUILDLINK3_MK:=  ${LIBDV_BUILDLINK3_MK}+
@@ -16,10 +16,4 @@
 BUILDLINK_PKGSRCDIR.libdv?=    ../../multimedia/libdv
 .endif # LIBDV_BUILDLINK3_MK
 
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib/buildlink3.mk"
-.include "../../devel/popt/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff -r d11af44e1f42 -r 25ad68c0727b multimedia/libdv/distinfo
--- a/multimedia/libdv/distinfo Fri Jun 03 14:41:19 2005 +0000
+++ b/multimedia/libdv/distinfo Fri Jun 03 15:40:30 2005 +0000
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 11:24:03 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/06/03 15:40:31 jmmv Exp $
 
 SHA1 (libdv-0.104.tar.gz) = 521a079193f4ae8f9995091b0590c87fde130650
 RMD160 (libdv-0.104.tar.gz) = a91708ecb75533caf2b9038ca68064c7707dcfdf
 Size (libdv-0.104.tar.gz) = 554691 bytes
 SHA1 (patch-aa) = 6910450f2c93ac4989e8c132368d208ddd65cf0d
+SHA1 (patch-ab) = f204ba8b80f48a5965397beb2239b44b45ca8920
+SHA1 (patch-ac) = a8d1fd55c9bf3ee59f34613e285314def3add60b
diff -r d11af44e1f42 -r 25ad68c0727b multimedia/libdv/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/libdv/patches/patch-ab Fri Jun 03 15:40:30 2005 +0000
@@ -0,0 +1,51 @@
+$NetBSD: patch-ab,v 1.1 2005/06/03 15:40:31 jmmv Exp $
+
+--- encodedv/Makefile.in.orig  2004-11-30 03:23:42.000000000 +0000
++++ encodedv/Makefile.in
+@@ -57,19 +57,19 @@ PROGRAMS = $(bin_PROGRAMS) $(noinst_PROG
+ am_dubdv_OBJECTS = insert_audio.$(OBJEXT)
+ dubdv_OBJECTS = $(am_dubdv_OBJECTS)
+ am__DEPENDENCIES_1 =
+-dubdv_DEPENDENCIES = ../libdv/libdv.la $(am__DEPENDENCIES_1)
++dubdv_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ am_dvavi_OBJECTS = dvavi.$(OBJEXT)
+ dvavi_OBJECTS = $(am_dvavi_OBJECTS)
+-dvavi_DEPENDENCIES = ../libdv/libdv.la
++dvavi_DEPENDENCIES = 
+ am_dvconnect_OBJECTS = dvconnect.$(OBJEXT)
+ dvconnect_OBJECTS = $(am_dvconnect_OBJECTS)
+ dvconnect_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ am_encodedv_OBJECTS = encodedv.$(OBJEXT)
+ encodedv_OBJECTS = $(am_encodedv_OBJECTS)
+-encodedv_DEPENDENCIES = ../libdv/libdv.la $(am__DEPENDENCIES_1)
++encodedv_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ am_fix_headers_OBJECTS = fix_headers.$(OBJEXT)
+ fix_headers_OBJECTS = $(am_fix_headers_OBJECTS)
+-fix_headers_DEPENDENCIES = ../libdv/libdv.la
++fix_headers_DEPENDENCIES = 
+ am_ppmqscale_OBJECTS = ppmqscale.$(OBJEXT)
+ ppmqscale_OBJECTS = $(am_ppmqscale_OBJECTS)
+ ppmqscale_LDADD = $(LDADD)
+@@ -232,18 +232,18 @@ EXTRA_DIST = $(man_MANS)
+ MAINTAINERCLEANFILES = Makefile.in $(AUX_DIST)
+ CLEANFILES = 
+ encodedv_SOURCES = encodedv.c 
+-encodedv_LDADD = ../libdv/libdv.la $(POPT_LIB)
++encodedv_LDADD = `pkg-config --libs libdv` $(POPT_LIB)
+ dubdv_SOURCES = insert_audio.c 
+-dubdv_LDADD = ../libdv/libdv.la $(POPT_LIB)
++dubdv_LDADD = `pkg-config --libs libdv` $(POPT_LIB)
+ fix_headers_SOURCES = fix_headers.c 
+-fix_headers_LDADD = ../libdv/libdv.la
++fix_headers_LDADD = `pkg-config --libs libdv`
+ scan_packet_headers_SOURCES = scan_packet_headers.c
+ steal_header_SOURCES = steal_header.c
+ ppmqscale_SOURCES = ppmqscale.c
+ dvconnect_SOURCES = dvconnect.c
+ dvconnect_LDADD = $(PTHREAD_LIBS) $(POPT_LIB)
+ dvavi_SOURCES = dvavi.c
+-dvavi_LDADD = ../libdv/libdv.la
++dvavi_LDADD = `pkg-config --libs libdv`
+ all: all-am
+ 
+ .SUFFIXES:
diff -r d11af44e1f42 -r 25ad68c0727b multimedia/libdv/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/libdv/patches/patch-ac Fri Jun 03 15:40:30 2005 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-ac,v 1.1 2005/06/03 15:40:31 jmmv Exp $
+
+--- playdv/Makefile.in.orig    2004-11-30 03:23:43.000000000 +0000
++++ playdv/Makefile.in
+@@ -58,7 +58,7 @@ am_playdv_OBJECTS = playdv.$(OBJEXT) dis
+ playdv_OBJECTS = $(am_playdv_OBJECTS)
Prev by Date: [pkgsrc/trunk]: pkgsrc MOZILLA_USE_GTK2 is a pkgsrc-internal variable -- pref...
Next by Date: [pkgsrc/trunk]: pkgsrc/doc/guide/files Document IGNORE_RECOMMENDED=YES. This ...
Previous by Thread: [pkgsrc/trunk]: pkgsrc MOZILLA_USE_GTK2 is a pkgsrc-internal variable -- pref...
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc/guide/files Document IGNORE_RECOMMENDED=YES. This ...
Indexes:
Home | Main Index | Thread Index | Old Index