tags 364259 patch thanks Hi Gerd,
Attached is a patch which fixes xawtv so that it builds with xorg 7.0. The first part of the patch, to fix the header path, seems correct to me for use with either X11R6 or X11R7. The second part of the patch, which is needed because @x_libraries@ is empty under X11R7 resulting in "-L -lFS" passed as arguments to ld, is not approrpiate for use with X11R6 because it will leave ld unable to locate libFS.so. That's not a concern for Debian, though, which will not support X11R6 for etch. Cheers, -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. [EMAIL PROTECTED] http://www.debian.org/
diff -u xawtv-3.94/debian/changelog xawtv-3.94/debian/changelog
--- xawtv-3.94/debian/changelog
+++ xawtv-3.94/debian/changelog
@@ -1,3 +1,12 @@
+xawtv (3.94-1.2) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * High-urgency upload for RC bugfix.
+ * Fix header/library path handling issues during build, due to Xorg
+ 7.0. Closes: #364259.
+
+ -- Steve Langasek <[EMAIL PROTECTED]> Mon, 8 May 2006 01:04:26 -0700
+
xawtv (3.94-1.1) unstable; urgency=low
* Non-maintainer upload.
only in patch2:
unchanged:
--- xawtv-3.94.orig/dist/xorg7.diff
+++ xawtv-3.94/dist/xorg7.diff
@@ -0,0 +1,22 @@
+diff -ur xawtv-3.94.orig/Makefile.in xawtv-3.94/Makefile.in
+--- xawtv-3.94.orig/Makefile.in 2004-04-22 07:52:29.000000000 -0700
++++ xawtv-3.94/Makefile.in 2006-05-08 01:01:05.000000000 -0700
+@@ -49,7 +49,7 @@
+ VBI_LIBS := @LIBZVBI@
+ GL_LIBS := @LIBGL@
+ DV_LIBS := @LIBDV@
+-FS_LIBS := [EMAIL PROTECTED]@ @FSLIB@
++FS_LIBS := @FSLIB@
+ DLFLAGS := @DLFLAGS@
+
+ # stuff configure has found
+diff -ur xawtv-3.94.orig/console/fs.h xawtv-3.94/console/fs.h
+--- xawtv-3.94.orig/console/fs.h 2003-02-14 06:14:04.000000000 -0800
++++ xawtv-3.94/console/fs.h 2006-05-08 00:54:39.000000000 -0700
+@@ -1,5 +1,5 @@
+ #ifndef X_DISPLAY_MISSING
+-# include <FSlib.h>
++# include <X11/fonts/FSlib.h>
+
+ struct fs_font {
+ Font font;
signature.asc
Description: Digital signature
