Hi.
This diff updates vcdimager to the latest available release.
Supposedly this version is unstable, but the latest stable is from 2001.
This is needed for a brasero port I'm working on.
If anyone still use vcd, please give it a shot, I intend to commit it
soon.
Thanks.
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/vcdimager/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile 15 Sep 2007 20:09:43 -0000 1.6
+++ Makefile 26 Jun 2010 15:44:41 -0000
@@ -2,23 +2,36 @@
COMMENT= (S)VCD authoring software
-VERSION= 0.6.2
-DISTNAME= vcdimager-${VERSION}
-PKGNAME= ${DISTNAME}p1
+DISTNAME= vcdimager-0.7.23
CATEGORIES= graphics
-MASTER_SITES= http://www.vcdimager.org/pub/vcdimager/vcdimager-0.6/
+SHARED_LIBS += vcdinfo 0.0 # .2.0
+
+MASTER_SITES= ${MASTER_SITE_GNU:=vcdimager/}
HOMEPAGE= http://www.vcdimager.org/
+# GPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
+WANTLIB += c m z
+
+MODULES= converters/libiconv
+
USE_LIBTOOL= Yes
+USE_GMAKE= Yes
+
+LIB_DEPENDS= xml2.>=11::textproc/libxml \
+ cdio,iso9660::audio/libcdio \
+ popt::devel/popt
+
CONFIGURE_STYLE= gnu
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+
SEPARATE_BUILD= concurrent
-WANTLIB= c m
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/vcdimager/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo 5 Apr 2007 16:19:58 -0000 1.3
+++ distinfo 26 Jun 2010 15:44:41 -0000
@@ -1,5 +1,5 @@
-MD5 (vcdimager-0.6.2.tar.gz) = 7TM5RaEDZnHdtsRl3MEDgA==
-RMD160 (vcdimager-0.6.2.tar.gz) = eHfYJdKE6h4K7Iw1Ipwcps2zA9Q=
-SHA1 (vcdimager-0.6.2.tar.gz) = +ugU+ZQVwwl1ph//1xiLSBvne2w=
-SHA256 (vcdimager-0.6.2.tar.gz) = heObrFRgENE5nT6ckcZjNEHe9d8pPZffP/RCn/pt6FE=
-SIZE (vcdimager-0.6.2.tar.gz) = 347973
+MD5 (vcdimager-0.7.23.tar.gz) = Xn2A/b8AN60g5DjyqVcyUw==
+RMD160 (vcdimager-0.7.23.tar.gz) = xD7RTwuBraQMlLWVTp5omDHO8sI=
+SHA1 (vcdimager-0.7.23.tar.gz) = bRoxJfqLf6iKmT4MAoytzAOsYwQ=
+SHA256 (vcdimager-0.7.23.tar.gz) = HnPfPGJfbE8OB92mDLYpNzkQwT373wPQ9H+PBYOT/xg=
+SIZE (vcdimager-0.7.23.tar.gz) = 1009549
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 26 Jan 2004 17:18:10 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-configure,v 1.1 2004/01/26 17:18:10 naddy Exp $
---- configure.orig 2001-05-15 03:11:37.000000000 +0200
-+++ configure 2004-01-25 01:46:31.000000000 +0100
-@@ -3914,7 +3914,7 @@ cat > conftest.$ac_ext <<EOF
- #include "confdefs.h"
-
- int main() {
--struct { int foo; int bar[]; } doo;
-+struct { int bar[]; } doo;
- ; return 0; }
- EOF
- if { (eval echo configure:3921: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
-@@ -3932,7 +3932,7 @@ if test "x$empty_array_size" = "xxxx";th
- #include "confdefs.h"
-
- int main() {
--struct { int foo; int bar[0]; } doo;
-+struct { int bar[0]; } doo;
- ; return 0; }
- EOF
- if { (eval echo configure:3939: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
Index: patches/patch-docs_vcdimager_info
===================================================================
RCS file: patches/patch-docs_vcdimager_info
diff -N patches/patch-docs_vcdimager_info
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-docs_vcdimager_info 26 Jun 2010 15:44:41 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- docs/vcdimager.info.orig Mon Jul 11 14:47:58 2005
++++ docs/vcdimager.info Sat Jun 26 17:30:33 2010
+@@ -20,7 +20,6 @@ INFO-DIR-SECTION Video CD Tools
+ START-INFO-DIR-ENTRY
+ * VCDImager: (vcdimager). GNU Video CD imaging utilities
+ * vcdimager: (vcdimager)vcdimager. Video CD simple formatter
+-* vcd-info: (vcdimager)vcd-info. Video CD diagnostic tool
+ * cdxa2mpeg: (vcdimager)cdxa2mpeg. Strip RIFF/CD-XA container
+ * vcdxminfo: (vcdimager)vcdxminfo. Display MPEG stream properties
+ * vcdxgen: (vcdimager)vcdxgen. Video CD XML template
generator
Index: patches/patch-lib_info_private_c
===================================================================
RCS file: patches/patch-lib_info_private_c
diff -N patches/patch-lib_info_private_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-lib_info_private_c 26 Jun 2010 15:44:41 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+http://savannah.gnu.org/support/index.php?func=detailitem&item_id=105012
+
+--- lib/info_private.c.orig Wed Feb 2 01:37:37 2005
++++ lib/info_private.c Sat Jun 26 17:29:43 2010
+@@ -102,10 +102,9 @@ vcdinf_update_offset_list(struct _vcdinf_pbc_ctx *obj,
+ }
+ } else {
+ /* See if we've skipped any LID numbers. */
+- last_lid++;
+ while (last_lid != ofs->lid ) {
+ lid_t * lid=calloc(1, sizeof(lid_t));
+- *lid = last_lid;
++ *lid = last_lid++;
+ _cdio_list_append(unused_lids, lid);
+ }
+ if (last_lid > max_seen_lid) max_seen_lid=last_lid;
Index: patches/patch-libvcd_vcd_types_h
===================================================================
RCS file: patches/patch-libvcd_vcd_types_h
diff -N patches/patch-libvcd_vcd_types_h
--- patches/patch-libvcd_vcd_types_h 23 Apr 2002 18:59:27 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-libvcd_vcd_types_h,v 1.1.1.1 2002/04/23 18:59:27 jakob Exp $
-
---- libvcd/vcd_types.h.orig Tue May 15 03:00:59 2001
-+++ libvcd/vcd_types.h Tue Apr 23 20:58:06 2002
-@@ -45,7 +45,7 @@ typedef u_int64_t uint64_t;
- #endif /* HAVE_STDINT_H */
-
- /* fix for bsdi... hope it works */
--#ifdef __bsdi__
-+#if defined(__bsdi__) || defined(__OpenBSD__)
- # define UINT32_C(c) c ## U
- # define UINT64_C(c) c ## ULL
- #endif
Index: pkg/PFRAG.shared
===================================================================
RCS file: pkg/PFRAG.shared
diff -N pkg/PFRAG.shared
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/PFRAG.shared 26 Jun 2010 15:44:41 -0000
@@ -0,0 +1,2 @@
+...@comment $OpenBSD$
+...@lib lib/libvcdinfo.so.${LIBvcdinfo_VERSION}
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/vcdimager/pkg/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- pkg/PLIST 15 Sep 2004 00:50:11 -0000 1.2
+++ pkg/PLIST 26 Jun 2010 15:44:41 -0000
@@ -1,6 +1,32 @@
@comment $OpenBSD: PLIST,v 1.2 2004/09/15 00:50:11 espie Exp $
-bin/vcdimager
-bin/vcdrip
+%%SHARED%%
+...@bin bin/cdxa2mpeg
+...@bin bin/vcd-info
+...@bin bin/vcdimager
+...@bin bin/vcdxbuild
+...@bin bin/vcdxgen
+...@bin bin/vcdxminfo
+...@bin bin/vcdxrip
+include/libvcd/
+include/libvcd/files.h
+include/libvcd/files_private.h
+include/libvcd/inf.h
+include/libvcd/info.h
+include/libvcd/logging.h
+include/libvcd/sector.h
+include/libvcd/types.h
+include/libvcd/version.h
+...@info info/vcd-info.info
@info info/vcdimager.info
+...@info info/vcdxrip.info
+lib/libvcdinfo.a
+lib/libvcdinfo.la
+lib/pkgconfig/
+lib/pkgconfig/libvcdinfo.pc
+...@man man/man1/cdxa2mpeg.1
+...@man man/man1/vcd-info.1
@man man/man1/vcdimager.1
-...@man man/man1/vcdrip.1
+...@man man/man1/vcdxbuild.1
+...@man man/man1/vcdxgen.1
+...@man man/man1/vcdxminfo.1
+...@man man/man1/vcdxrip.1
--
Antoine
