diff --git a/multimedia/libdv/Makefile b/multimedia/libdv/Makefile new file mode 100644 index 00000000000..c3bc4d2c459 --- /dev/null +++ b/multimedia/libdv/Makefile @@ -0,0 +1,36 @@ +# $OpenBSD: Makefile,v 1.1.1.1 2004/06/26 18:00:27 sturm Exp $ + +COMMENT= "Quasar DV codec" + +DISTNAME= libdv-0.102 +CATEGORIES= multimedia + +HOMEPAGE= http://libdv.sourceforge.net/ + +MAINTAINER= Jacob Meuser + +# GPL +PERMIT_PACKAGE_CDROM= Yes +PERMIT_PACKAGE_FTP= Yes +PERMIT_DISTFILES_CDROM= Yes +PERMIT_DISTFILES_FTP= Yes + +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libdv/} + +BUILD_DEPENDS= ::devel/pkgconfig + +LIB_DEPENDS= SDL.2::devel/sdl \ + gdk.1.2,gtk.1.2::x11/gtk+ \ + glib.1.2,gmodule.1.2::devel/glib \ + popt.0::devel/popt + +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_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" \ + PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${X11BASE}/lib/pkgconfig + +.include diff --git a/multimedia/libdv/distinfo b/multimedia/libdv/distinfo new file mode 100644 index 00000000000..525dbf2fa2c --- /dev/null +++ b/multimedia/libdv/distinfo @@ -0,0 +1,3 @@ +MD5 (libdv-0.102.tar.gz) = 21f2968fa756961ee2cb7d96834ade80 +RMD160 (libdv-0.102.tar.gz) = 262ea1dc3e0746002ed90ba1b17e78caa511ca15 +SHA1 (libdv-0.102.tar.gz) = 66d2609bd639c8223f388dc1d1de653f9e61fd2d diff --git a/multimedia/libdv/patches/patch-configure b/multimedia/libdv/patches/patch-configure new file mode 100644 index 00000000000..29b124f5a8c --- /dev/null +++ b/multimedia/libdv/patches/patch-configure @@ -0,0 +1,38 @@ +$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 + + + +-echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 +-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6 ++echo "$as_me:$LINENO: checking for pthread_create in -pthread" >&5 ++echo $ECHO_N "checking for pthread_create in -pthread... $ECHO_C" >&6 + if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lpthread $LIBS" ++LIBS="-pthread $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -20153,7 +20153,7 @@ 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 +- PTHREAD_LIBS="-lpthread" ++ PTHREAD_LIBS="-pthread" + fi + + diff --git a/multimedia/libdv/patches/patch-encodedv_Makefile_in b/multimedia/libdv/patches/patch-encodedv_Makefile_in new file mode 100644 index 00000000000..d7d39acf1d6 --- /dev/null +++ b/multimedia/libdv/patches/patch-encodedv_Makefile_in @@ -0,0 +1,12 @@ +$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@ + 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@ diff --git a/multimedia/libdv/patches/patch-encodedv_dvconnect_c b/multimedia/libdv/patches/patch-encodedv_dvconnect_c new file mode 100644 index 00000000000..4fad4f5c09f --- /dev/null +++ b/multimedia/libdv/patches/patch-encodedv_dvconnect_c @@ -0,0 +1,32 @@ +$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 + #include ++#include + #include + #include + #include +@@ -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 + } + + /* ------------------------------------------------------------------------ diff --git a/multimedia/libdv/patches/patch-libdv_Makefile_in b/multimedia/libdv/patches/patch-libdv_Makefile_in new file mode 100644 index 00000000000..829c5ddd6f5 --- /dev/null +++ b/multimedia/libdv/patches/patch-libdv_Makefile_in @@ -0,0 +1,12 @@ +$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@ + 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@ diff --git a/multimedia/libdv/patches/patch-libdv_YUY2_c b/multimedia/libdv/patches/patch-libdv_YUY2_c new file mode 100644 index 00000000000..59658ad61fd --- /dev/null +++ b/multimedia/libdv/patches/patch-libdv_YUY2_c @@ -0,0 +1,18 @@ +$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 + #endif + ++#if !defined(__OpenBSD__) + #if HAVE_ENDIAN_H + #include + #elif HAVE_MACHINE_ENDIAN_H + #include + #endif ++#endif /* OpenBSD */ ++ + #include + + #include "YUY2.h" diff --git a/multimedia/libdv/patches/patch-libdv_bitstream_h b/multimedia/libdv/patches/patch-libdv_bitstream_h new file mode 100644 index 00000000000..e5e758fb8a3 --- /dev/null +++ b/multimedia/libdv/patches/patch-libdv_bitstream_h @@ -0,0 +1,17 @@ +$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 + #elif HAVE_MACHINE_ENDIAN_H + #include + #endif ++#endif /* OpenBSD */ + + #ifdef __cplusplus + extern "C" { diff --git a/multimedia/libdv/patches/patch-libdv_dv_c b/multimedia/libdv/patches/patch-libdv_dv_c new file mode 100644 index 00000000000..f134d06b5c1 --- /dev/null +++ b/multimedia/libdv/patches/patch-libdv_dv_c @@ -0,0 +1,16 @@ +$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 +@@ -67,8 +67,12 @@ + #define DV_MB420_YUV_MMX(a,b,c,d,e) dv_mb420_YUY2_mmx(a,b,c,d,e) + #endif + ++#ifndef MIN + #define MIN(a,b) ((a)<(b)?(a):(b)) ++#endif ++#ifndef MAX + #define MAX(a,b) ((a)<(b)?(b):(a)) ++#endif + + int dv_use_mmx; + pthread_mutex_t dv_mutex = PTHREAD_MUTEX_INITIALIZER; diff --git a/multimedia/libdv/patches/patch-libdv_dv_h b/multimedia/libdv/patches/patch-libdv_dv_h new file mode 100644 index 00000000000..93aa9d75821 --- /dev/null +++ b/multimedia/libdv/patches/patch-libdv_dv_h @@ -0,0 +1,13 @@ +$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 + + #include ++#if HAVE_STDINT_H + #include ++#endif + #include + + #ifdef __cplusplus diff --git a/multimedia/libdv/patches/patch-libdv_dv_types_h b/multimedia/libdv/patches/patch-libdv_dv_types_h new file mode 100644 index 00000000000..204879d3ca2 --- /dev/null +++ b/multimedia/libdv/patches/patch-libdv_dv_types_h @@ -0,0 +1,27 @@ +$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 ++#if HAVE_STDINT_H + #include ++#endif + #include + #include ++#if !defined(__OpenBSD__) + #if HAVE_ENDIAN_H + #include + #elif HAVE_MACHINE_ENDIAN_H + #include + #endif ++#endif /* OpenBSD */ + + /* please tell me these are defined somewhere standard??? */ ++#if defined(__OpenBSD__) /* HAVE_SYS_PARAM_H */ ++# include ++#endif + #ifndef FALSE + #define FALSE 0 + #endif diff --git a/multimedia/libdv/patches/patch-libdv_encode_c b/multimedia/libdv/patches/patch-libdv_encode_c new file mode 100644 index 00000000000..c2e007f5d86 --- /dev/null +++ b/multimedia/libdv/patches/patch-libdv_encode_c @@ -0,0 +1,14 @@ +$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 + #include + #include +-#include ++#if HAVE_STDINT_H ++# include ++#endif + + #include "dv.h" + #include "encode.h" diff --git a/multimedia/libdv/patches/patch-libdv_headers_c b/multimedia/libdv/patches/patch-libdv_headers_c new file mode 100644 index 00000000000..93da412639d --- /dev/null +++ b/multimedia/libdv/patches/patch-libdv_headers_c @@ -0,0 +1,13 @@ +$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 + #include ++#if HAVE_STDINT_H + #include ++#endif + + #include "headers.h" + diff --git a/multimedia/libdv/patches/patch-ltmain_sh b/multimedia/libdv/patches/patch-ltmain_sh new file mode 100644 index 00000000000..a6a64c5b480 --- /dev/null +++ b/multimedia/libdv/patches/patch-ltmain_sh @@ -0,0 +1,55 @@ +$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\"" + # Exit here if they wanted silent mode. + test "$show" = : && exit 0 + +- $echo "----------------------------------------------------------------------" +- $echo "Libraries have been installed in:" +- for libdir in $libdirs; do +- $echo " $libdir" +- done +- $echo +- $echo "If you ever happen to want to link against installed libraries" +- $echo "in a given directory, LIBDIR, you must either use libtool, and" +- $echo "specify the full pathname of the library, or use the \`-LLIBDIR'" +- $echo "flag during linking and do at least one of the following:" +- if test -n "$shlibpath_var"; then +- $echo " - add LIBDIR to the \`$shlibpath_var' environment variable" +- $echo " during execution" +- fi +- if test -n "$runpath_var"; then +- $echo " - add LIBDIR to the \`$runpath_var' environment variable" +- $echo " during linking" +- fi +- if test -n "$hardcode_libdir_flag_spec"; then +- libdir=LIBDIR +- eval flag=\"$hardcode_libdir_flag_spec\" +- +- $echo " - use the \`$flag' linker flag" +- fi +- if test -n "$admincmds"; then +- $echo " - have your system administrator run these commands:$admincmds" +- fi +- if test -f /etc/ld.so.conf; then +- $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" +- fi +- $echo +- $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 + ;; + diff --git a/multimedia/libdv/patches/patch-playdv_Makefile_in b/multimedia/libdv/patches/patch-playdv_Makefile_in new file mode 100644 index 00000000000..10a3e027aa0 --- /dev/null +++ b/multimedia/libdv/patches/patch-playdv_Makefile_in @@ -0,0 +1,12 @@ +$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 + 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 diff --git a/multimedia/libdv/patches/patch-playdv_oss_c b/multimedia/libdv/patches/patch-playdv_oss_c new file mode 100644 index 00000000000..833f5879f1c --- /dev/null +++ b/multimedia/libdv/patches/patch-playdv_oss_c @@ -0,0 +1,23 @@ +$OpenBSD: patch-playdv_oss_c,v 1.1.1.1 2004/06/26 18:00:27 sturm Exp $ +--- playdv/oss.c.orig 2002-12-31 15:03:42.000000000 -0800 ++++ playdv/oss.c 2004-01-09 00:13:47.000000000 -0800 +@@ -34,11 +34,19 @@ + #include + #include + #include ++#if HAVE_SYS_SOUNDCARD_H + #include ++#else ++#include ++#endif + + #include "oss.h" + ++#if !defined(__OpenBSD__) + static const char *default_device = "/dev/dsp"; ++#else ++static const char *default_device = "/dev/audio"; ++#endif + + #ifndef O_LARGEFILE + #define O_LARGEFILE 0 diff --git a/multimedia/libdv/pkg/DESCR b/multimedia/libdv/pkg/DESCR new file mode 100644 index 00000000000..a142bb4fce6 --- /dev/null +++ b/multimedia/libdv/pkg/DESCR @@ -0,0 +1,5 @@ +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. diff --git a/multimedia/libdv/pkg/PFRAG.shared b/multimedia/libdv/pkg/PFRAG.shared new file mode 100644 index 00000000000..cfeb99a6515 --- /dev/null +++ b/multimedia/libdv/pkg/PFRAG.shared @@ -0,0 +1,3 @@ +@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2004/06/26 18:00:27 sturm Exp $ +lib/libdv.so.4.0 +DYNLIBDIR(%D/lib) diff --git a/multimedia/libdv/pkg/PLIST b/multimedia/libdv/pkg/PLIST new file mode 100644 index 00000000000..2eb29b4dc26 --- /dev/null +++ b/multimedia/libdv/pkg/PLIST @@ -0,0 +1,17 @@ +@comment $OpenBSD: PLIST,v 1.1.1.1 2004/06/26 18:00:27 sturm Exp $ +bin/dubdv +@comment bin/dvconnect +bin/encodedv +bin/playdv +include/libdv/dv.h +include/libdv/dv1394.h +include/libdv/dv_types.h +lib/libdv.a +lib/libdv.la +lib/pkgconfig/libdv.pc +man/man1/dubdv.1 +@comment man/man1/dvconnect.1 +man/man1/encodedv.1 +man/man1/playdv.1 +%%SHARED%% +@dirrm include/libdv