update to 0.103, remove sprintf usage
from maintainer
This commit is contained in:
jolan
parent
63069d7be3
commit
a1cf2dec52
@ -1,8 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.1.1.1 2004/06/26 18:00:27 sturm Exp $
|
||||
# $OpenBSD: Makefile,v 1.2 2004/10/13 01:44:20 jolan Exp $
|
||||
|
||||
COMMENT= "Quasar DV codec"
|
||||
|
||||
DISTNAME= libdv-0.102
|
||||
DISTNAME= libdv-0.103
|
||||
CATEGORIES= multimedia
|
||||
|
||||
HOMEPAGE= http://libdv.sourceforge.net/
|
||||
@ -24,6 +24,7 @@ LIB_DEPENDS= SDL.2::devel/sdl \
|
||||
glib.1.2,gmodule.1.2::devel/glib \
|
||||
popt.0::devel/popt
|
||||
|
||||
SEPARATE_BUILD= concurrent
|
||||
USE_X11= Yes
|
||||
CONFIGURE_STYLE= gnu
|
||||
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (libdv-0.102.tar.gz) = 21f2968fa756961ee2cb7d96834ade80
|
||||
RMD160 (libdv-0.102.tar.gz) = 262ea1dc3e0746002ed90ba1b17e78caa511ca15
|
||||
SHA1 (libdv-0.102.tar.gz) = 66d2609bd639c8223f388dc1d1de653f9e61fd2d
|
||||
MD5 (libdv-0.103.tar.gz) = b5c7d0db672a76528e100828dd866a79
|
||||
RMD160 (libdv-0.103.tar.gz) = b383c2fecaac4be495e4fe9c4627aa2c33669358
|
||||
SHA1 (libdv-0.103.tar.gz) = 12a91fb92bd6f876b69566ea2c7e2fc2611b4cf1
|
||||
|
||||
@ -1,16 +1,90 @@
|
||||
$OpenBSD: patch-configure,v 1.1.1.1 2004/06/26 18:00:27 sturm Exp $
|
||||
--- configure.orig 2004-03-27 11:43:21.000000000 -0800
|
||||
+++ configure 2004-05-01 17:07:37.000000000 -0700
|
||||
@@ -7419,7 +7419,7 @@ if test -z "$aix_libpath"; then aix_libp
|
||||
hardcode_shlibpath_var=no
|
||||
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||
archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
|
||||
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
|
||||
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
|
||||
export_dynamic_flag_spec='${wl}-E'
|
||||
else
|
||||
case $host_os in
|
||||
@@ -20088,13 +20088,13 @@ fi
|
||||
$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*)
|
||||
;;
|
||||
|
||||
openbsd*)
|
||||
- lt_cv_file_magic_cmd=/usr/bin/file
|
||||
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
|
||||
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||
- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
|
||||
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
|
||||
else
|
||||
- lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
|
||||
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
|
||||
fi
|
||||
;;
|
||||
|
||||
@@ -8134,7 +8135,7 @@ openbsd*)
|
||||
version_type=sunos
|
||||
need_lib_prefix=no
|
||||
need_version=yes
|
||||
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
|
||||
+ library_names_spec='${libname}${shared_ext}$versuffix'
|
||||
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
|
||||
# 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::"'
|
||||
;;
|
||||
+ openbsd*)
|
||||
+ hardcode_direct_CXX=yes
|
||||
+ hardcode_shlibpath_var_CXX=no
|
||||
+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
|
||||
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
|
||||
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||
+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${
|
||||
+wl}-retain-symbols-file,$export_symbols -o $lib'
|
||||
+ export_dynamic_flag_spec_CXX='${wl}-E'
|
||||
+ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
|
||||
+ fi
|
||||
+ output_verbose_link_cmd='echo'
|
||||
+ ;;
|
||||
osf3*)
|
||||
case $cc_basename in
|
||||
KCC)
|
||||
@@ -11853,7 +11867,7 @@ openbsd*)
|
||||
version_type=sunos
|
||||
need_lib_prefix=no
|
||||
need_version=yes
|
||||
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
|
||||
+ library_names_spec='${libname}${shared_ext}$versuffix'
|
||||
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*)
|
||||
version_type=sunos
|
||||
need_lib_prefix=no
|
||||
need_version=yes
|
||||
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
|
||||
+ library_names_spec='${libname}${shared_ext}$versuffix'
|
||||
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*)
|
||||
version_type=sunos
|
||||
need_lib_prefix=no
|
||||
need_version=yes
|
||||
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
|
||||
+ library_names_spec='${libname}${shared_ext}$versuffix'
|
||||
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
|
||||
|
||||
|
||||
|
||||
@ -27,7 +101,7 @@ $OpenBSD: patch-configure,v 1.1.1.1 2004/06/26 18:00:27 sturm Exp $
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
@@ -20153,7 +20153,7 @@ fi
|
||||
@@ -20325,17 +20339,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
|
||||
@ -36,3 +110,27 @@ $OpenBSD: patch-configure,v 1.1.1.1 2004/06/26 18:00:27 sturm Exp $
|
||||
fi
|
||||
|
||||
|
||||
-OS_ARCH=`uname -s | sed -e 's|/|_|g'`
|
||||
+#OS_ARCH=`uname -s | sed -e 's|/|_|g'`
|
||||
# FreeBSD and OpenBSD have neither -lpthread nor integrated pthreads in libc.
|
||||
# Instead -pthread is used to the compiler/linker to get pthreads working right.
|
||||
-if test x$OS_ARCH = xFreeBSD -o x$OS_ARCH = xOpenBSD; then
|
||||
- CFLAGS="$CFLAGS -pthread"
|
||||
- CXXFLAGS="$CXXFLAGS -pthread"
|
||||
-fi
|
||||
+#if test x$OS_ARCH = xFreeBSD -o x$OS_ARCH = xOpenBSD; then
|
||||
+# CFLAGS="$CFLAGS -pthread"
|
||||
+# CXXFLAGS="$CXXFLAGS -pthread"
|
||||
+#fi
|
||||
|
||||
|
||||
|
||||
@@ -20912,7 +20926,7 @@ fi
|
||||
|
||||
|
||||
for ac_header in fcntl.h sys/time.h unistd.h linux/videodev.h sys/soundcard.h \
|
||||
-endian.h machine/endian.h inttypes.h
|
||||
+inttypes.h
|
||||
do
|
||||
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||||
if eval "test \"\${$as_ac_Header+set}\" = set"; then
|
||||
|
||||
@ -1,12 +1,29 @@
|
||||
$OpenBSD: patch-encodedv_Makefile_in,v 1.1.1.1 2004/06/26 18:00:27 sturm Exp $
|
||||
--- encodedv/Makefile.in.orig 2004-05-01 18:43:01.000000000 -0700
|
||||
+++ encodedv/Makefile.in 2004-05-01 18:43:54.000000000 -0700
|
||||
@@ -78,7 +78,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
$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@DEP_FILES = ./$(DEPDIR)/dvavi.Po ./$(DEPDIR)/dvconnect.Po \
|
||||
@@ -150,7 +151,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LIBOBJS = @LIBOBJS@
|
||||
-LIBS = @LIBS@
|
||||
+LIBS = @LIBS@ $(PTHREAD_LIBS)
|
||||
|
||||
LIBTOOL = $(SHELL) $(top_builddir)/libtool --silent
|
||||
LN_S = @LN_S@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
@@ -238,7 +239,7 @@ scan_packet_headers_SOURCES = scan_packe
|
||||
steal_header_SOURCES = steal_header.c
|
||||
ppmqscale_SOURCES = ppmqscale.c
|
||||
dvconnect_SOURCES = dvconnect.c
|
||||
-dvconnect_LDADD = $(PTHREAD_LIBS) $(POPT_LIB)
|
||||
+dvconnect_LDADD = $(POPT_LIB)
|
||||
dvavi_SOURCES = dvavi.c
|
||||
dvavi_LDADD = ../libdv/libdv.la
|
||||
all: all-am
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
$OpenBSD: patch-encodedv_dvconnect_c,v 1.1.1.1 2004/06/26 18:00:27 sturm Exp $
|
||||
--- encodedv/dvconnect.c.orig 2004-01-16 07:38:21.000000000 -0800
|
||||
+++ encodedv/dvconnect.c 2004-05-01 16:59:58.000000000 -0700
|
||||
@@ -31,6 +31,7 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <sys/ioctl.h>
|
||||
+#include <sys/types.h>
|
||||
#include <sys/mman.h>
|
||||
#include <sys/time.h>
|
||||
#include <unistd.h>
|
||||
@@ -854,6 +855,12 @@ int rt_raisepri (int pri)
|
||||
/*
|
||||
* Verify that scheduling is available
|
||||
*/
|
||||
+
|
||||
+#if defined(__OpenBSD__)
|
||||
+ fprintf (stderr, "WARNING: RR-scheduler not available, "
|
||||
+ "disabling.\n");
|
||||
+ return (-1);
|
||||
+#else
|
||||
if (sysconf (_SC_PRIORITY_SCHEDULING) == -1) {
|
||||
fprintf (stderr, "WARNING: RR-scheduler not available, "
|
||||
"disabling.\n");
|
||||
@@ -868,6 +875,7 @@ int rt_raisepri (int pri)
|
||||
}
|
||||
#endif
|
||||
return (0);
|
||||
+#endif
|
||||
}
|
||||
|
||||
/* ------------------------------------------------------------------------
|
||||
@ -1,12 +1,29 @@
|
||||
$OpenBSD: patch-libdv_Makefile_in,v 1.1.1.1 2004/06/26 18:00:27 sturm Exp $
|
||||
--- libdv/Makefile.in.orig 2004-03-27 11:43:19.000000000 -0800
|
||||
+++ libdv/Makefile.in 2004-05-01 18:41:58.000000000 -0700
|
||||
@@ -78,7 +78,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
$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@DEP_FILES = ./$(DEPDIR)/YUY2.Plo ./$(DEPDIR)/YV12.Plo \
|
||||
@@ -180,7 +181,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LIBOBJS = @LIBOBJS@
|
||||
-LIBS = @LIBS@
|
||||
+LIBS = @LIBS@ $(PTHREAD_LIBS)
|
||||
|
||||
LIBTOOL = $(SHELL) $(top_builddir)/libtool --silent
|
||||
LN_S = @LN_S@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
@@ -293,7 +294,7 @@ recode_LDADD = libdv.la
|
||||
reppm_SOURCES = reppm.c
|
||||
reppm_LDADD = libdv.la
|
||||
enctest_SOURCES = enctest.c
|
||||
-enctest_LDADD = libdv.la $(PTHREAD_LIBS)
|
||||
+enctest_LDADD = libdv.la
|
||||
all: $(BUILT_SOURCES)
|
||||
$(MAKE) $(AM_MAKEFLAGS) all-am
|
||||
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
$OpenBSD: patch-libdv_YUY2_c,v 1.1.1.1 2004/06/26 18:00:27 sturm Exp $
|
||||
--- libdv/YUY2.c.orig 2004-01-06 01:04:42.000000000 -0800
|
||||
+++ libdv/YUY2.c 2004-01-06 01:06:23.000000000 -0800
|
||||
@@ -31,11 +31,14 @@
|
||||
# include <config.h>
|
||||
#endif
|
||||
|
||||
+#if !defined(__OpenBSD__)
|
||||
#if HAVE_ENDIAN_H
|
||||
#include <endian.h>
|
||||
#elif HAVE_MACHINE_ENDIAN_H
|
||||
#include <machine/endian.h>
|
||||
#endif
|
||||
+#endif /* OpenBSD */
|
||||
+
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "YUY2.h"
|
||||
@ -1,17 +0,0 @@
|
||||
$OpenBSD: patch-libdv_bitstream_h,v 1.1.1.1 2004/06/26 18:00:27 sturm Exp $
|
||||
--- libdv/bitstream.h.orig 2004-01-06 01:43:11.000000000 -0800
|
||||
+++ libdv/bitstream.h 2004-01-06 01:44:27.000000000 -0800
|
||||
@@ -32,11 +32,13 @@
|
||||
#define DV_BITSTREAM_H
|
||||
|
||||
#include "dv_types.h"
|
||||
+#if !defined(__OpenBSD__)
|
||||
#if HAVE_ENDIAN_H
|
||||
#include <endian.h>
|
||||
#elif HAVE_MACHINE_ENDIAN_H
|
||||
#include <machine/endian.h>
|
||||
#endif
|
||||
+#endif /* OpenBSD */
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-libdv_dv_c,v 1.1.1.1 2004/06/26 18:00:27 sturm Exp $
|
||||
--- libdv/dv.c.orig 2004-03-15 12:22:20.000000000 -0800
|
||||
+++ libdv/dv.c 2004-05-02 17:04:41.000000000 -0700
|
||||
$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
|
||||
@@ -67,8 +67,12 @@
|
||||
#define DV_MB420_YUV_MMX(a,b,c,d,e) dv_mb420_YUY2_mmx(a,b,c,d,e)
|
||||
#endif
|
||||
@ -13,4 +13,31 @@ $OpenBSD: patch-libdv_dv_c,v 1.1.1.1 2004/06/26 18:00:27 sturm Exp $
|
||||
+#endif
|
||||
|
||||
int dv_use_mmx;
|
||||
pthread_mutex_t dv_mutex = PTHREAD_MUTEX_INITIALIZER;
|
||||
|
||||
@@ -791,7 +795,7 @@ dv_get_timestamp (dv_decoder_t *dv, char
|
||||
int id;
|
||||
|
||||
if ((id = dv -> ssyb_pack [0x13]) != 0xff) {
|
||||
- sprintf (tstptr,
|
||||
+ snprintf (tstptr, 128,
|
||||
"%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
|
||||
year = dv -> ssyb_data [id1] [3];
|
||||
year = (year & 0x0f) + 10 * ((year >> 4) & 0x0f);
|
||||
year += (year < 25) ? 2000 : 1900;
|
||||
- sprintf (dtptr,
|
||||
+ snprintf (dtptr, 128,
|
||||
"%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
|
||||
year = dv -> vaux_data [id1] [3];
|
||||
year = (year & 0x0f) + 10 * ((year >> 4) & 0x0f);
|
||||
year += (year < 25) ? 2000 : 1900;
|
||||
- sprintf (dtptr,
|
||||
+ snprintf (dtptr, 128,
|
||||
"%04d-%02d-%02d %02d:%02d:%02d",
|
||||
year,
|
||||
((dv -> vaux_data [id1] [2] >> 4) & 0x01) * 10 +
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
$OpenBSD: patch-libdv_dv_h,v 1.1.1.1 2004/06/26 18:00:27 sturm Exp $
|
||||
--- libdv/dv.h.orig 2002-12-31 15:03:39.000000000 -0800
|
||||
+++ libdv/dv.h 2004-01-09 00:15:57.000000000 -0800
|
||||
@@ -41,7 +41,9 @@
|
||||
#include <libdv/dv_types.h>
|
||||
|
||||
#include <stdio.h>
|
||||
+#if HAVE_STDINT_H
|
||||
#include <stdint.h>
|
||||
+#endif
|
||||
#include <time.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
@ -1,22 +1,8 @@
|
||||
$OpenBSD: patch-libdv_dv_types_h,v 1.1.1.1 2004/06/26 18:00:27 sturm Exp $
|
||||
--- libdv/dv_types.h.orig 2002-12-31 15:03:40.000000000 -0800
|
||||
+++ libdv/dv_types.h 2004-05-02 13:12:28.000000000 -0700
|
||||
@@ -35,16 +35,23 @@
|
||||
#endif // HAVE_LIBPOPT
|
||||
|
||||
#include <stdlib.h>
|
||||
+#if HAVE_STDINT_H
|
||||
#include <stdint.h>
|
||||
+#endif
|
||||
#include <stdio.h>
|
||||
#include <time.h>
|
||||
+#if !defined(__OpenBSD__)
|
||||
#if HAVE_ENDIAN_H
|
||||
#include <endian.h>
|
||||
#elif HAVE_MACHINE_ENDIAN_H
|
||||
#include <machine/endian.h>
|
||||
$OpenBSD: patch-libdv_dv_types_h,v 1.2 2004/10/13 01:44:20 jolan Exp $
|
||||
--- libdv/dv_types.h.orig Tue Jul 13 18:56:44 2004
|
||||
+++ libdv/dv_types.h Mon Oct 4 19:49:02 2004
|
||||
@@ -45,6 +45,9 @@
|
||||
#endif
|
||||
+#endif /* OpenBSD */
|
||||
|
||||
/* please tell me these are defined somewhere standard??? */
|
||||
+#if defined(__OpenBSD__) /* HAVE_SYS_PARAM_H */
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
$OpenBSD: patch-libdv_encode_c,v 1.1.1.1 2004/06/26 18:00:27 sturm Exp $
|
||||
--- libdv/encode.c.orig 2002-12-31 15:03:40.000000000 -0800
|
||||
+++ libdv/encode.c 2004-01-09 00:20:08.000000000 -0800
|
||||
@@ -46,7 +46,9 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
-#include <stdint.h>
|
||||
+#if HAVE_STDINT_H
|
||||
+# include <stdint.h>
|
||||
+#endif
|
||||
|
||||
#include "dv.h"
|
||||
#include "encode.h"
|
||||
@ -1,13 +0,0 @@
|
||||
$OpenBSD: patch-libdv_headers_c,v 1.1.1.1 2004/06/26 18:00:27 sturm Exp $
|
||||
--- libdv/headers.c.orig 2002-12-31 15:03:40.000000000 -0800
|
||||
+++ libdv/headers.c 2004-01-09 00:18:22.000000000 -0800
|
||||
@@ -29,7 +29,9 @@
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
+#if HAVE_STDINT_H
|
||||
#include <stdint.h>
|
||||
+#endif
|
||||
|
||||
#include "headers.h"
|
||||
|
||||
10
multimedia/libdv/patches/patch-libdv_pc_in
Normal file
10
multimedia/libdv/patches/patch-libdv_pc_in
Normal file
@ -0,0 +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
|
||||
@@ -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@
|
||||
Cflags: -I${includedir}
|
||||
@ -1,20 +1,40 @@
|
||||
$OpenBSD: patch-ltmain_sh,v 1.1.1.1 2004/06/26 18:00:27 sturm Exp $
|
||||
--- ltmain.sh.orig Sat Jun 26 10:40:33 2004
|
||||
+++ ltmain.sh Sat Jun 26 10:40:54 2004
|
||||
@@ -2209,10 +2209,6 @@ EOF
|
||||
link_static=no # Whether the deplib will be linked statically
|
||||
if test -n "$library_names" &&
|
||||
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
|
||||
- if test "$installed" = no; then
|
||||
- notinst_deplibs="$notinst_deplibs $lib"
|
||||
- need_relink=yes
|
||||
- fi
|
||||
# This is a shared library
|
||||
|
||||
# Warn about portability, can't link against -module's on some systems (darwin)
|
||||
@@ -5705,40 +5701,6 @@ relink_command=\"$relink_command\""
|
||||
$OpenBSD: patch-ltmain_sh,v 1.2 2004/10/13 01:44:20 jolan Exp $
|
||||
--- ltmain.sh.orig Wed Jul 14 09:13:47 2004
|
||||
+++ ltmain.sh Mon Oct 4 19:04:13 2004
|
||||
@@ -2154,10 +2154,17 @@ EOF
|
||||
absdir="$libdir"
|
||||
fi
|
||||
else
|
||||
- dir="$ladir/$objdir"
|
||||
- absdir="$abs_ladir/$objdir"
|
||||
- # Remove this search path later
|
||||
- notinst_path="$notinst_path $abs_ladir"
|
||||
+ if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
|
||||
+ dir="$ladir"
|
||||
+ absdir="$abs_ladir"
|
||||
+ # Remove this search path later
|
||||
+ notinst_path="$notinst_path $abs_ladir"
|
||||
+ else
|
||||
+ dir="$ladir/$objdir"
|
||||
+ absdir="$abs_ladir/$objdir"
|
||||
+ # Remove this search path later
|
||||
+ notinst_path="$notinst_path $abs_ladir"
|
||||
+ fi
|
||||
fi # $installed = yes
|
||||
name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
|
||||
|
||||
@@ -2471,7 +2478,7 @@ EOF
|
||||
add_dir=
|
||||
add=
|
||||
# Finalize command for both is simple: just hardcode it.
|
||||
- if test "$hardcode_direct" = yes; then
|
||||
+ if test "$hardcode_direct" = yes && test -f $libdir/$linklib; then
|
||||
add="$libdir/$linklib"
|
||||
elif test "$hardcode_minus_L" = yes; then
|
||||
add_dir="-L$libdir"
|
||||
@@ -5827,40 +5834,6 @@ relink_command=\"$relink_command\""
|
||||
# Exit here if they wanted silent mode.
|
||||
test "$show" = : && exit 0
|
||||
test "$show" = : && exit $EXIT_SUCCESS
|
||||
|
||||
- $echo "----------------------------------------------------------------------"
|
||||
- $echo "Libraries have been installed in:"
|
||||
@ -50,6 +70,6 @@ $OpenBSD: patch-ltmain_sh,v 1.1.1.1 2004/06/26 18:00:27 sturm Exp $
|
||||
- $echo "See any operating system documentation about shared libraries for"
|
||||
- $echo "more information, such as the ld(1) and ld.so(8) manual pages."
|
||||
- $echo "----------------------------------------------------------------------"
|
||||
exit 0
|
||||
exit $EXIT_SUCCESS
|
||||
;;
|
||||
|
||||
|
||||
@ -1,12 +1,20 @@
|
||||
$OpenBSD: patch-playdv_Makefile_in,v 1.1.1.1 2004/06/26 18:00:27 sturm Exp $
|
||||
--- playdv/Makefile.in.orig 2004-03-27 11:43:20.000000000 -0800
|
||||
+++ playdv/Makefile.in 2004-05-01 16:59:58.000000000 -0700
|
||||
@@ -171,7 +171,7 @@ bin_PROGRAMS = playdv
|
||||
$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@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)
|
||||
subdir = playdv
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
all: all-am
|
||||
|
||||
.SUFFIXES:
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.2 2004/09/15 18:04:35 espie Exp $
|
||||
@lib lib/libdv.so.4.0
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.3 2004/10/13 01:44:20 jolan Exp $
|
||||
@lib lib/libdv.so.4.1
|
||||
|
||||
@ -1,11 +1,10 @@
|
||||
@comment $OpenBSD: PLIST,v 1.2 2004/09/15 18:04:35 espie Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.3 2004/10/13 01:44:20 jolan Exp $
|
||||
bin/dubdv
|
||||
@comment bin/dvconnect
|
||||
bin/encodedv
|
||||
bin/playdv
|
||||
include/libdv/
|
||||
include/libdv/dv.h
|
||||
include/libdv/dv1394.h
|
||||
include/libdv/dv_types.h
|
||||
lib/libdv.a
|
||||
lib/libdv.la
|
||||
|
||||
Loading…
Reference in New Issue
Block a user