Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/libs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18709
Modified Files:
libdv4.info libdv4.patch
Log Message:
don't build playdv for now until liboss1 is fixed
Index: libdv4.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/libs/libdv4.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libdv4.info 27 Apr 2005 17:03:26 -0000 1.2
+++ libdv4.info 28 Apr 2005 15:05:39 -0000 1.3
@@ -1,6 +1,6 @@
Package: libdv4
Version: 0.104
-Revision: 1
+Revision: 2
###
Depends: %N-shlibs (= %v-%r)
BuildDepends: fink (>= 0.9.9), pkgconfig, audiofile, esound, glib, gtk+,
liboss1, popt, gettext-dev, gettext-bin, gettext-tools, libiconv-dev, x11-dev
@@ -15,12 +15,20 @@
Patch: %n.patch
###
SetCPPFLAGS: -no-cpp-precomp -U_SC_PRIORITY_SCHEDULING
+SetCFLAGS: -U_SC_PRIORITY_SCHEDULING
NoSetLDFLAGS: true
SetLIBS: -L%p/lib
###
DocFiles: COPYING COPYRIGHT
###
ConfigureParams: --disable-asm --disable-sdl --with-x --with-pic
--enable-shared --enable-static --mandir=%i/share/man --infodir=%p/share/info
--libexecdir=%p/lib
+CompileScript: <<
+#!/bin/sh -e
+
+./configure %c
+perl -pi -e 's,playdv,,g' Makefile
+make
+<<
###
SplitOff: <<
Package: %N-shlibs
Index: libdv4.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/libs/libdv4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libdv4.patch 27 Apr 2005 03:26:02 -0000 1.1
+++ libdv4.patch 28 Apr 2005 15:05:40 -0000 1.2
@@ -1,10 +1,18 @@
---- libdv-0.104/encodedv/dvconnect.c Sun May 30 22:05:23 2004
-+++ libdv-0.104-patched/encodedv/dvconnect.c Tue Mar 15 16:04:10 2005
-@@ -863,6 +863,7 @@
+diff -uNr libdv-0.104/encodedv/dvconnect.c libdv-0.104-new/encodedv/dvconnect.c
+--- libdv-0.104/encodedv/dvconnect.c 2004-05-30 22:05:23.000000000 -0400
++++ libdv-0.104-new/encodedv/dvconnect.c 2005-04-28 10:43:43.000000000
-0400
+@@ -857,12 +857,13 @@
+
+ int rt_raisepri (int pri)
+ {
+-#ifdef _SC_PRIORITY_SCHEDULING
++#if defined(_SC_PRIORITY_SCHEDULING) && !defined(__APPLE__)
+ struct sched_param scp;
+
/*
* Verify that scheduling is available
*/
-+#ifdef _SC_PRIORITY_SCHEDULING
++#if defined(_SC_PRIORITY_SCHEDULING) && !defined(__APPLE__)
if (sysconf (_SC_PRIORITY_SCHEDULING) == -1) {
fprintf (stderr, "WARNING: RR-scheduler not available, "
"disabling.\n");
@@ -20,8 +28,21 @@
}
/* ------------------------------------------------------------------------
---- libdv-0.104/playdv/Makefile.in Mon Nov 29 22:23:43 2004
-+++ libdv-0.104-patched/playdv/Makefile.in Tue Mar 15 16:04:10 2005
+diff -uNr libdv-0.104/libdv/vlc.h libdv-0.104-new/libdv/vlc.h
+--- libdv-0.104/libdv/vlc.h 2003-10-20 15:46:50.000000000 -0400
++++ libdv-0.104-new/libdv/vlc.h 2005-04-28 10:43:43.000000000 -0400
+@@ -69,7 +69,7 @@
+ extern void dv_decode_vlc(int bits,int maxbits, dv_vlc_t *result);
+ extern void __dv_decode_vlc(int bits, dv_vlc_t *result);
+
+-extern __inline__ void dv_peek_vlc(bitstream_t *bs,int maxbits, dv_vlc_t
*result) {
++static __inline__ void dv_peek_vlc(bitstream_t *bs,int maxbits, dv_vlc_t
*result) {
+ if(maxbits < 16)
+ dv_decode_vlc(bitstream_show(bs,16),maxbits,result);
+ else
+diff -uNr libdv-0.104/playdv/Makefile.in libdv-0.104-new/playdv/Makefile.in
+--- libdv-0.104/playdv/Makefile.in 2004-11-29 22:23:43.000000000 -0500
++++ libdv-0.104-new/playdv/Makefile.in 2005-04-28 10:43:43.000000000 -0400
@@ -209,7 +209,7 @@
AM_CFLAGS = $(SDL_CFLAGS) $(GTK_CFLAGS)
noinst_HEADERS = display.h oss.h
@@ -31,8 +52,9 @@
all: all-am
.SUFFIXES:
---- libdv-0.104/playdv/oss.c Sun Nov 23 17:59:08 2003
-+++ libdv-0.104-patched/playdv/oss.c Tue Mar 15 16:04:10 2005
+diff -uNr libdv-0.104/playdv/oss.c libdv-0.104-new/playdv/oss.c
+--- libdv-0.104/playdv/oss.c 2003-11-23 17:59:08.000000000 -0500
++++ libdv-0.104-new/playdv/oss.c 2005-04-28 10:43:43.000000000 -0400
@@ -34,7 +34,11 @@
#include <sys/types.h>
#include <sys/stat.h>
-------------------------------------------------------
SF.Net email is sponsored by: Tell us your software development plans!
Take this survey and enter to win a one-year sub to SourceForge.net
Plus IDC's 2005 look-ahead and a copy of this survey
Click here to start! http://www.idcswdc.com/cgi-bin/survey?id=105hix
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
