cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drop uneeded patches.

Browse Source
This commit is contained in:
ajacoutot 2015-05-02 13:03:14 +00:00
parent 909f468aca
commit 8b5ac203e2
7 changed files with 6 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
multimedia/libdv/Makefile
View File

@ -1,11 +1,14 @@
# $OpenBSD: Makefile,v 1.20 2015/03/16 18:07:51 naddy Exp $
# $OpenBSD: Makefile,v 1.21 2015/05/02 13:03:14 ajacoutot Exp $
COMMENT= Quasar DV codec
DISTNAME= libdv-1.0.0
REVISION= 1
REVISION= 2
CATEGORIES= multimedia
SHARED_LIBS += dv 5.0 # 4.3
HOMEPAGE= http://libdv.sourceforge.net/
# LGPLv2.1
@ -17,13 +20,10 @@ MODULES= devel/gettext
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libdv/}
SHARED_LIBS= dv 5.0
LIB_DEPENDS= devel/popt
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--disable-sdl \
--disable-gtk \
--with-x

21
multimedia/libdv/patches/patch-configure
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-configure,v 1.7 2010/08/23 07:51:22 jasper Exp $
--- configure.orig Mon Sep 25 22:11:47 2006
+++ configure Sat Aug 21 14:23:04 2010
@@ -20807,6 +20807,8 @@ OS_ARCH=`uname -s | sed -e 's|/|_|g'`
if test x$OS_ARCH = xFreeBSD -o x$OS_ARCH = xOpenBSD; then
CFLAGS="$CFLAGS -pthread"
CXXFLAGS="$CXXFLAGS -pthread"
+ PTHREAD_LIBS="-pthread"
+ echo "\toverriding with -pthread for OpenBSD" >&6
fi
@@ -21463,7 +21465,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 { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

21
multimedia/libdv/patches/patch-encodedv_Makefile_in
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-encodedv_Makefile_in,v 1.5 2010/08/23 07:51:22 jasper Exp $
--- encodedv/Makefile.in.orig Mon Sep 25 22:11:48 2006
+++ encodedv/Makefile.in Sat Aug 21 14:23:04 2010
@@ -148,7 +148,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@
@@ -245,7 +245,7 @@ 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)
+dvconnect_LDADD = $(POPT_LIB)
dvavi_SOURCES = dvavi.c
dvavi_LDADD = ../libdv/libdv.la
all: all-am

30
multimedia/libdv/patches/patch-libdv_Makefile_in
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-libdv_Makefile_in,v 1.4 2010/08/23 07:51:22 jasper Exp $
--- libdv/Makefile.in.orig Mon Sep 25 22:11:48 2006
+++ libdv/Makefile.in Sat Aug 21 14:23:04 2010
@@ -189,7 +189,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@
@@ -317,7 +317,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
@@ -380,7 +380,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 \

43
multimedia/libdv/patches/patch-libdv_dv_c
View File

@ -1,43 +0,0 @@
$OpenBSD: patch-libdv_dv_c,v 1.4 2009/03/06 20:04:56 jasper Exp $
--- libdv/dv.c.orig Wed Oct 20 05:49:24 2004
+++ libdv/dv.c Mon Mar 2 21:59:07 2009
@@ -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;
@@ -798,7 +802,7 @@ dv_get_timestamp (dv_decoder_t *dv, char *tstptr)
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),
@@ -853,7 +857,7 @@ dv_get_recording_datetime (dv_decoder_t *dv, char *dtp
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 +
@@ -875,7 +879,7 @@ dv_get_recording_datetime (dv_decoder_t *dv, char *dtp
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 +

13
multimedia/libdv/patches/patch-libdv_dv_types_h
View File

@ -1,13 +0,0 @@
$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
/* please tell me these are defined somewhere standard??? */
+#if defined(__OpenBSD__) /* HAVE_SYS_PARAM_H */
+# include <sys/param.h>
+#endif
#ifndef FALSE
#define FALSE 0
#endif

10
multimedia/libdv/patches/patch-libdv_pc_in
View File

@ -1,10 +0,0 @@
$OpenBSD: patch-libdv_pc_in,v 1.2 2005/02/22 22:24:36 naddy Exp $
--- 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 -lm @REQUIRES_NOPKGCONFIG@
+Libs: -L${libdir} -ldv -lm -pthread @REQUIRES_NOPKGCONFIG@
Cflags: -I${includedir}