[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
update: multimedia/libdv 0.103 -> 0.104
- To: ports_(_at_)_openbsd_(_dot_)_org
- Subject: update: multimedia/libdv 0.103 -> 0.104
- From: Jacob Meuser <jakemsr_(_at_)_jakemsr_(_dot_)_com>
- Date: Sat, 12 Feb 2005 15:17:16 -0800
- Mail-followup-to: ports_(_at_)_openbsd_(_dot_)_org
this is an update for multimedia/libdv to the latest release,
libdv-0.104.
this release features optimized assmebly for amd64. playdv can
now play at the proper rate on amd64 machines.
changes in the port:
remove inter-library dependencies (does not affect dependent ports).
fix playdv double-free crash at EOF.
can no longer be built with SEPARATE_BUILD, needs more investigation.
WANTLIB markers.
--
<jakemsr_(_at_)_jakemsr_(_dot_)_com>
Index: multimedia/libdv/Makefile
===================================================================
RCS file: /home/cvs/OpenBSD/ports/multimedia/libdv/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- multimedia/libdv/Makefile 13 Oct 2004 01:44:20 -0000 1.2
+++ multimedia/libdv/Makefile 12 Feb 2005 08:34:20 -0000
@@ -2,7 +2,7 @@
COMMENT= "Quasar DV codec"
-DISTNAME= libdv-0.103
+DISTNAME= libdv-0.104
CATEGORIES= multimedia
HOMEPAGE= http://libdv.sourceforge.net/
@@ -24,12 +24,12 @@
glib.1.2,gmodule.1.2::devel/glib \
popt.0::devel/popt
-SEPARATE_BUILD= concurrent
+WANTLIB= X11 Xext Xi Xv c iconv intl m ossaudio pthread usbhid
+
USE_X11= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
-CONFIGURE_ARGS+= --with-gnu-ld=no --enable-sdl --enable-gtk \
- --with-x --without-debug
+CONFIGURE_ARGS+= --enable-sdl --enable-gtk --with-x
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${X11BASE}/lib/pkgconfig
Index: multimedia/libdv/distinfo
===================================================================
RCS file: /home/cvs/OpenBSD/ports/multimedia/libdv/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- multimedia/libdv/distinfo 5 Jan 2005 17:05:06 -0000 1.3
+++ multimedia/libdv/distinfo 12 Feb 2005 08:34:20 -0000
@@ -1,4 +1,4 @@
-MD5 (libdv-0.103.tar.gz) = b5c7d0db672a76528e100828dd866a79
-RMD160 (libdv-0.103.tar.gz) = b383c2fecaac4be495e4fe9c4627aa2c33669358
-SHA1 (libdv-0.103.tar.gz) = 12a91fb92bd6f876b69566ea2c7e2fc2611b4cf1
-SIZE (libdv-0.103.tar.gz) = 529106
+MD5 (libdv-0.104.tar.gz) = f6b08efce7472daa20685e6e8431f542
+RMD160 (libdv-0.104.tar.gz) = a91708ecb75533caf2b9038ca68064c7707dcfdf
+SHA1 (libdv-0.104.tar.gz) = 521a079193f4ae8f9995091b0590c87fde130650
+SIZE (libdv-0.104.tar.gz) = 554691
Index: multimedia/libdv/patches/patch-configure
===================================================================
RCS file: /home/cvs/OpenBSD/ports/multimedia/libdv/patches/patch-configure,v
retrieving revision 1.2
diff -u -r1.2 patch-configure
--- multimedia/libdv/patches/patch-configure 13 Oct 2004 01:44:20 -0000 1.2
+++ multimedia/libdv/patches/patch-configure 12 Feb 2005 08:34:20 -0000
@@ -1,19 +1,7 @@
$OpenBSD: patch-configure,v 1.2 2004/10/13 01:44:20 jolan Exp $
---- configure.orig Wed Jul 14 08:51:11 2004
-+++ configure Mon Oct 4 19:45:02 2004
-@@ -3503,7 +3503,10 @@ else
- # I'd rather use --version here, but apparently some GNU ld's only accept -v.
- case `$LD -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-- lt_cv_prog_gnu_ld=yes
-+ case $host_os in
-+ openbsd*) lt_cv_prog_gnu_ld=no ;;
-+ *) lt_cv_prog_gnu_ld=yes ;;
-+ esac
- ;;
- *)
- lt_cv_prog_gnu_ld=no
-@@ -3720,12 +3723,10 @@ nto-qnx*)
+--- configure.orig Mon Nov 29 19:23:44 2004
++++ configure Fri Feb 11 01:22:37 2005
+@@ -3761,12 +3761,10 @@ nto-qnx*)
;;
openbsd*)
@@ -28,7 +16,7 @@
fi
;;
-@@ -8134,7 +8135,7 @@ openbsd*)
+@@ -8175,7 +8173,7 @@ openbsd*)
version_type=sunos
need_lib_prefix=no
need_version=yes
@@ -37,7 +25,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -10544,6 +10545,19 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -10585,6 +10583,19 @@ if test -z "$aix_libpath"; then aix_libp
# Workaround some broken pre-1.5 toolchains
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
;;
@@ -57,7 +45,7 @@
osf3*)
case $cc_basename in
KCC)
-@@ -11853,7 +11867,7 @@ openbsd*)
+@@ -11894,7 +11905,7 @@ openbsd*)
version_type=sunos
need_lib_prefix=no
need_version=yes
@@ -66,7 +54,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -15023,7 +15037,7 @@ openbsd*)
+@@ -15064,7 +15075,7 @@ openbsd*)
version_type=sunos
need_lib_prefix=no
need_version=yes
@@ -75,7 +63,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -17391,7 +17405,7 @@ openbsd*)
+@@ -17432,7 +17443,7 @@ openbsd*)
version_type=sunos
need_lib_prefix=no
need_version=yes
@@ -84,7 +72,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -20260,13 +20274,13 @@ fi
+@@ -20320,13 +20331,13 @@ fi
@@ -101,7 +89,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -20325,17 +20339,17 @@ fi
+@@ -20385,17 +20396,17 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
if test $ac_cv_lib_pthread_pthread_create = yes; then
@@ -125,7 +113,7 @@
-@@ -20912,7 +20926,7 @@ fi
+@@ -20972,7 +20983,7 @@ fi
for ac_header in fcntl.h sys/time.h unistd.h linux/videodev.h sys/soundcard.h \
Index: multimedia/libdv/patches/patch-encodedv_Makefile_in
===================================================================
RCS file: /home/cvs/OpenBSD/ports/multimedia/libdv/patches/patch-encodedv_Makefile_in,v
retrieving revision 1.2
diff -u -r1.2 patch-encodedv_Makefile_in
--- multimedia/libdv/patches/patch-encodedv_Makefile_in 13 Oct 2004 01:44:20 -0000 1.2
+++ multimedia/libdv/patches/patch-encodedv_Makefile_in 12 Feb 2005 08:34:20 -0000
@@ -1,15 +1,7 @@
$OpenBSD: patch-encodedv_Makefile_in,v 1.2 2004/10/13 01:44:20 jolan Exp $
---- encodedv/Makefile.in.orig Wed Jul 14 08:41:22 2004
-+++ encodedv/Makefile.in Mon Oct 4 20:32:22 2004
-@@ -78,6 +78,7 @@ am_steal_header_OBJECTS = steal_header.$
- steal_header_OBJECTS = $(am_steal_header_OBJECTS)
- steal_header_LDADD = $(LDADD)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+INCLUDES = -I$(top_srcdir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- @AMDEP_TRUE_(_at_)_DEP_FILES = ./$(DEPDIR)/dvavi.Po ./$(DEPDIR)/dvconnect.Po \
-@@ -150,7 +151,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+--- encodedv/Makefile.in.orig Mon Nov 29 19:23:42 2004
++++ encodedv/Makefile.in Sat Feb 12 00:02:49 2005
+@@ -148,7 +148,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
@@ -18,7 +10,7 @@
LIBTOOL = $(SHELL) $(top_builddir)/libtool --silent
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-@@ -238,7 +239,7 @@ scan_packet_headers_SOURCES = scan_packe
+@@ -241,7 +241,7 @@ scan_packet_headers_SOURCES = scan_packe
steal_header_SOURCES = steal_header.c
ppmqscale_SOURCES = ppmqscale.c
dvconnect_SOURCES = dvconnect.c
Index: multimedia/libdv/patches/patch-libdv_Makefile_in
===================================================================
RCS file: /home/cvs/OpenBSD/ports/multimedia/libdv/patches/patch-libdv_Makefile_in,v
retrieving revision 1.2
diff -u -r1.2 patch-libdv_Makefile_in
--- multimedia/libdv/patches/patch-libdv_Makefile_in 13 Oct 2004 01:44:20 -0000 1.2
+++ multimedia/libdv/patches/patch-libdv_Makefile_in 12 Feb 2005 08:34:20 -0000
@@ -1,15 +1,7 @@
$OpenBSD: patch-libdv_Makefile_in,v 1.2 2004/10/13 01:44:20 jolan Exp $
---- libdv/Makefile.in.orig Wed Jul 14 08:41:22 2004
-+++ libdv/Makefile.in Mon Oct 4 20:31:18 2004
-@@ -95,6 +95,7 @@ am_testvlc_OBJECTS = testvlc.$(OBJEXT)
- testvlc_OBJECTS = $(am_testvlc_OBJECTS)
- testvlc_DEPENDENCIES = libdv.la
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+INCLUDES = -I$(top_srcdir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- @AMDEP_TRUE_(_at_)_DEP_FILES = ./$(DEPDIR)/YUY2.Plo ./$(DEPDIR)/YV12.Plo \
-@@ -180,7 +181,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+--- libdv/Makefile.in.orig Mon Nov 29 19:23:43 2004
++++ libdv/Makefile.in Sat Feb 12 00:02:49 2005
+@@ -189,7 +189,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
@@ -18,7 +10,7 @@
LIBTOOL = $(SHELL) $(top_builddir)/libtool --silent
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-@@ -293,7 +294,7 @@ recode_LDADD = libdv.la
+@@ -313,7 +313,7 @@ recode_LDADD = libdv.la
reppm_SOURCES = reppm.c
reppm_LDADD = libdv.la
enctest_SOURCES = enctest.c
@@ -27,3 +19,12 @@
all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am
+@@ -376,7 +376,7 @@ clean-libLTLIBRARIES:
+ rm -f "$${dir}/so_locations"; \
+ done
+ libdv.la: $(libdv_la_OBJECTS) $(libdv_la_DEPENDENCIES)
+- $(LINK) -rpath $(libdir) $(libdv_la_LDFLAGS) $(libdv_la_OBJECTS) $(libdv_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(libdv_la_LDFLAGS) $(libdv_la_OBJECTS) $(libdv_la_LIBADD)
+
+ clean-noinstPROGRAMS:
+ @list='$(noinst_PROGRAMS)'; for p in $$list; do \
Index: multimedia/libdv/patches/patch-libdv_dv_c
===================================================================
RCS file: /home/cvs/OpenBSD/ports/multimedia/libdv/patches/patch-libdv_dv_c,v
retrieving revision 1.2
diff -u -r1.2 patch-libdv_dv_c
--- multimedia/libdv/patches/patch-libdv_dv_c 13 Oct 2004 01:44:20 -0000 1.2
+++ multimedia/libdv/patches/patch-libdv_dv_c 12 Feb 2005 08:34:20 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-libdv_dv_c,v 1.2 2004/10/13 01:44:20 jolan Exp $
---- libdv/dv.c.orig Tue Jul 6 17:44:22 2004
-+++ libdv/dv.c Mon Oct 4 19:33:31 2004
+--- libdv/dv.c.orig Tue Oct 19 20:49:24 2004
++++ libdv/dv.c Fri Feb 11 01:22:37 2005
@@ -67,8 +67,12 @@
#define DV_MB420_YUV_MMX(a,b,c,d,e) dv_mb420_YUY2_mmx(a,b,c,d,e)
#endif
@@ -14,7 +14,7 @@
int dv_use_mmx;
-@@ -791,7 +795,7 @@ dv_get_timestamp (dv_decoder_t *dv, char
+@@ -798,7 +802,7 @@ dv_get_timestamp (dv_decoder_t *dv, char
int id;
if ((id = dv -> ssyb_pack [0x13]) != 0xff) {
@@ -23,7 +23,7 @@
"%02d:%02d:%02d.%02d",
((dv -> ssyb_data [id] [3] >> 4) & 0x03) * 10 +
(dv -> ssyb_data [id] [3] & 0x0f),
-@@ -846,7 +850,7 @@ dv_get_recording_datetime (dv_decoder_t
+@@ -853,7 +857,7 @@ dv_get_recording_datetime (dv_decoder_t
year = dv -> ssyb_data [id1] [3];
year = (year & 0x0f) + 10 * ((year >> 4) & 0x0f);
year += (year < 25) ? 2000 : 1900;
@@ -32,7 +32,7 @@
"%04d-%02d-%02d %02d:%02d:%02d",
year,
((dv -> ssyb_data [id1] [2] >> 4) & 0x01) * 10 +
-@@ -868,7 +872,7 @@ dv_get_recording_datetime (dv_decoder_t
+@@ -875,7 +879,7 @@ dv_get_recording_datetime (dv_decoder_t
year = dv -> vaux_data [id1] [3];
year = (year & 0x0f) + 10 * ((year >> 4) & 0x0f);
year += (year < 25) ? 2000 : 1900;
Index: multimedia/libdv/patches/patch-libdv_pc_in
===================================================================
RCS file: /home/cvs/OpenBSD/ports/multimedia/libdv/patches/patch-libdv_pc_in,v
retrieving revision 1.1
diff -u -r1.1 patch-libdv_pc_in
--- multimedia/libdv/patches/patch-libdv_pc_in 13 Oct 2004 01:44:20 -0000 1.1
+++ multimedia/libdv/patches/patch-libdv_pc_in 12 Feb 2005 08:52:36 -0000
@@ -1,10 +1,10 @@
$OpenBSD: patch-libdv_pc_in,v 1.1 2004/10/13 01:44:20 jolan Exp $
---- libdv.pc.in.orig Mon Oct 4 20:37:07 2004
-+++ libdv.pc.in Mon Oct 4 20:37:32 2004
+--- libdv.pc.in.orig Mon Nov 29 17:44:55 2004
++++ libdv.pc.in Sat Feb 12 00:52:15 2005
@@ -7,5 +7,5 @@ Name: libdv
Description: DV software codec
Requires:
Version: @VERSION@
--Libs: -L${libdir} -ldv @REQUIRES_NOPKGCONFIG@
-+Libs: -L${libdir} -ldv -pthread @REQUIRES_NOPKGCONFIG@
+-Libs: -L${libdir} -ldv -lm @REQUIRES_NOPKGCONFIG@
++Libs: -L${libdir} -ldv -lm -pthread @REQUIRES_NOPKGCONFIG@
Cflags: -I${includedir}
Index: multimedia/libdv/patches/patch-playdv_Makefile_in
===================================================================
RCS file: /home/cvs/OpenBSD/ports/multimedia/libdv/patches/patch-playdv_Makefile_in,v
retrieving revision 1.2
diff -u -r1.2 patch-playdv_Makefile_in
--- multimedia/libdv/patches/patch-playdv_Makefile_in 13 Oct 2004 01:44:20 -0000 1.2
+++ multimedia/libdv/patches/patch-playdv_Makefile_in 12 Feb 2005 08:34:20 -0000
@@ -1,20 +1,12 @@
$OpenBSD: patch-playdv_Makefile_in,v 1.2 2004/10/13 01:44:20 jolan Exp $
---- playdv/Makefile.in.orig Wed Jul 14 08:41:22 2004
-+++ playdv/Makefile.in Mon Oct 4 20:03:13 2004
-@@ -58,6 +58,7 @@ am__DEPENDENCIES_1 =
- playdv_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) ../libdv/libdv.la $(am__DEPENDENCIES_1)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+INCLUDES = -I$(top_srcdir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- @AMDEP_TRUE_(_at_)_DEP_FILES = ./$(DEPDIR)/display.Po ./$(DEPDIR)/oss.Po \
-@@ -202,7 +203,7 @@ CLEANFILES =
- AM_CFLAGS = $(SDL_CFLAGS) $(GTK_CFLAGS)
- noinst_HEADERS = display.h oss.h
- playdv_SOURCES = playdv.c display.c display.h oss.c
--playdv_LDADD = $(SDL_LIBS) $(GTK_LIBS) $(XV_LIB) ../libdv/libdv.la $(POPT_LIB)
-+playdv_LDADD = $(SDL_LIBS) $(GTK_LIBS) -lossaudio $(XV_LIB) ../libdv/libdv.la $(POPT_LIB)
- all: all-am
-
- .SUFFIXES:
+--- playdv/Makefile.in.orig Mon Nov 29 19:23:43 2004
++++ playdv/Makefile.in Sat Feb 12 00:02:49 2005
+@@ -123,7 +123,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ -lossaudio $(PTHREAD_LIBS)
+ LIBTOOL = $(SHELL) $(top_builddir)/libtool --silent
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
Index: multimedia/libdv/patches/patch-playdv_playdv_c
===================================================================
RCS file: multimedia/libdv/patches/patch-playdv_playdv_c
diff -N multimedia/libdv/patches/patch-playdv_playdv_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ multimedia/libdv/patches/patch-playdv_playdv_c 12 Feb 2005 08:47:01 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+--- playdv/playdv.c.orig Fri Feb 11 01:57:43 2005
++++ playdv/playdv.c Fri Feb 11 02:01:55 2005
+@@ -508,9 +508,9 @@ restart:
+ seconds += dv_player->tv[2].tv_sec;
+ fprintf(stderr,"Processed %d frames in %05.2f seconds (%05.2f fps)\n",
+ frame_count, seconds, (double)frame_count/seconds);
+- if(!dv_player->arg_disable_video) {
+- dv_display_exit(dv_player->display);
+- } /* if */
++ // if(!dv_player->arg_disable_video) {
++ // dv_display_exit(dv_player->display);
++ // } /* if */
+ if(!dv_player->arg_disable_audio) {
+ dv_oss_close(dv_player->oss);
+ } /* if */
Index: multimedia/libdv/pkg/PFRAG.shared
===================================================================
RCS file: /home/cvs/OpenBSD/ports/multimedia/libdv/pkg/PFRAG.shared,v
retrieving revision 1.3
diff -u -r1.3 PFRAG.shared
--- multimedia/libdv/pkg/PFRAG.shared 13 Oct 2004 01:44:20 -0000 1.3
+++ multimedia/libdv/pkg/PFRAG.shared 12 Feb 2005 08:34:20 -0000
@@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2004/10/13 01:44:20 jolan Exp $
-_(_at_)_lib lib/libdv.so.4.1
+_(_at_)_lib lib/libdv.so.4.2
Visit your host, monkey.org