Hi,
I've uploaded an NMU to fix this bug as part of the BSP this weekend.
The diff follows (this includes the changes in the previous NMU diff I
sent).
I also needed to rebootstrap the autotools. Note that the upstream
autogen.sh does not use --force with libtoolize, so ltmain.sh doesn't
get updated. You need to do this manually, or fix the script.
Regards,
Roger
diff -urN ogle-0.9.2.original/ac3/ac3dec_wrap.c ogle-0.9.2/ac3/ac3dec_wrap.c
--- ogle-0.9.2.original/ac3/ac3dec_wrap.c 2003-03-02 15:50:03.000000000
+0000
+++ ogle-0.9.2/ac3/ac3dec_wrap.c 2005-09-04 19:54:46.084905304 +0100
@@ -48,7 +48,7 @@
static void handle_events(MsgEventQ_t *q, MsgEvent_t *ev);
-static char *program_name;
+char *program_name;
static FILE *outfile;
diff -urN ogle-0.9.2.original/ac3/Makefile.am ogle-0.9.2/ac3/Makefile.am
--- ogle-0.9.2.original/ac3/Makefile.am 2003-10-14 02:05:15.000000000 +0100
+++ ogle-0.9.2/ac3/Makefile.am 2005-09-04 22:06:17.763187848 +0100
@@ -17,7 +17,7 @@
pkglib_PROGRAMS = ogle_ac3_p ogle_audio
-AM_CPPFLAGS = @TOP_INCLUDES@ @A52_CPPFLAGS@ @MAD_CPPFLAGS@ @XML_CFLAGS@
+AM_CPPFLAGS = @TOP_INCLUDES@ @A52_CPPFLAGS@ @MAD_CPPFLAGS@ @XML_CPPFLAGS@
AM_CFLAGS = @O_CFLAGS@
diff -urN ogle-0.9.2.original/ac3/Makefile.in ogle-0.9.2/ac3/Makefile.in
diff -urN ogle-0.9.2.original/aclocal.m4 ogle-0.9.2/aclocal.m4
diff -urN ogle-0.9.2.original/common/Makefile.in ogle-0.9.2/common/Makefile.in
diff -urN ogle-0.9.2.original/config.guess ogle-0.9.2/config.guess
diff -urN ogle-0.9.2.original/config.sub ogle-0.9.2/config.sub
diff -urN ogle-0.9.2.original/configure ogle-0.9.2/configure
diff -urN ogle-0.9.2.original/configure.in ogle-0.9.2/configure.in
--- ogle-0.9.2.original/configure.in 2005-09-04 19:52:13.000000000 +0100
+++ ogle-0.9.2/configure.in 2005-09-04 21:41:03.068456448 +0100
@@ -495,7 +495,7 @@
[
#include <sys/asoundlib.h>
#if defined(SND_LIB_MAJOR) && defined(SND_LIB_MINOR)
-#if SND_LIB_MAJOR>0 || (SND_LIB_MAJOR==0 && SND_LIB_MINOR==5)
+#if SND_LIB_MAJOR==0 && SND_LIB_MINOR==5
AP_maGiC_VALUE
#endif
#endif
diff -urN ogle-0.9.2.original/ctrl/Makefile.in ogle-0.9.2/ctrl/Makefile.in
diff -urN ogle-0.9.2.original/debian/changelog ogle-0.9.2/debian/changelog
--- ogle-0.9.2.original/debian/changelog 2005-09-04 19:52:13.000000000
+0100
+++ ogle-0.9.2/debian/changelog 2005-09-04 22:17:20.350459272 +0100
@@ -1,3 +1,25 @@
+ogle (0.9.2-2.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Build correctly with the current ALSA. Thanks to Frank Lichtenheld.
+ - configure.in: Check for SND_LIB_MAJOR==0 && SND_LIB_MINOR==5
+ - */Makefile.am: Use XML_CPPFLAGS, rather than XML_CFLAGS; this is
+ due to an incompatible change in libxml2.
+ - libogleao/alsa_audio.c: Add semicolon at end of compound after
+ __diga_end label.
+ - Closes: #326549
+ * debian/changelog: Recode from ISO-8859-1 to UTF-8.
+
+ -- Roger Leigh <[EMAIL PROTECTED]> Sun, 4 Sep 2005 22:16:22 +0100
+
+ogle (0.9.2-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * ac3/ac3dec_wrap.c: program_name should not be declared static.
+ Applied patch from Andreas Jochens (Closes: #287850).
+
+ -- Roger Leigh <[EMAIL PROTECTED]> Sun, 4 Sep 2005 19:55:15 +0100
+
ogle (0.9.2-2) unstable; urgency=low
* Quoting in startup script, fix problem with spaces in filenames,
@@ -22,7 +44,7 @@
ogle (0.9.1-3) unstable; urgency=low
- * Improve package description, thanks to Javier Fernández-Sanguino Peña
+ * Improve package description, thanks to Javier Fernández-Sanguino Peña
(Closes: #209668).
* Improve english in manpage, thanks to Paul Telford (Closes: #168984).
diff -urN ogle-0.9.2.original/doc/Makefile.in ogle-0.9.2/doc/Makefile.in
diff -urN ogle-0.9.2.original/doc/man/Makefile.in ogle-0.9.2/doc/man/Makefile.in
diff -urN ogle-0.9.2.original/dvd_cli/Makefile.am ogle-0.9.2/dvd_cli/Makefile.am
--- ogle-0.9.2.original/dvd_cli/Makefile.am 2003-10-14 02:05:15.000000000
+0100
+++ ogle-0.9.2/dvd_cli/Makefile.am 2005-09-04 22:06:20.282804808 +0100
@@ -17,7 +17,7 @@
pkglib_PROGRAMS = ogle_cli
-AM_CPPFLAGS = @TOP_INCLUDES@ @X_CFLAGS@ @XML_CFLAGS@
+AM_CPPFLAGS = @TOP_INCLUDES@ @X_CFLAGS@ @XML_CPPFLAGS@
AM_CFLAGS = @O_CFLAGS@
ogle_cli_SOURCES = main.c \
diff -urN ogle-0.9.2.original/dvd_cli/Makefile.in ogle-0.9.2/dvd_cli/Makefile.in
diff -urN ogle-0.9.2.original/include/Makefile.in ogle-0.9.2/include/Makefile.in
diff -urN ogle-0.9.2.original/libogleao/alsa_audio.c
ogle-0.9.2/libogleao/alsa_audio.c
--- ogle-0.9.2.original/libogleao/alsa_audio.c 2003-10-19 01:38:30.000000000
+0100
+++ ogle-0.9.2/libogleao/alsa_audio.c 2005-09-04 21:41:38.956000712 +0100
@@ -251,6 +251,7 @@
snd_ctl_close(ctl_handle);
__diga_end:
+ ;
}
return 0;
diff -urN ogle-0.9.2.original/libogleao/Makefile.in
ogle-0.9.2/libogleao/Makefile.in
diff -urN ogle-0.9.2.original/ltmain.sh ogle-0.9.2/ltmain.sh
diff -urN ogle-0.9.2.original/Makefile.in ogle-0.9.2/Makefile.in
diff -urN ogle-0.9.2.original/mpeg2_program/Makefile.in
ogle-0.9.2/mpeg2_program/Makefile.in
diff -urN ogle-0.9.2.original/mpeg2_video/Makefile.am
ogle-0.9.2/mpeg2_video/Makefile.am
--- ogle-0.9.2.original/mpeg2_video/Makefile.am 2003-10-14 02:05:15.000000000
+0100
+++ ogle-0.9.2/mpeg2_video/Makefile.am 2005-09-04 22:06:23.170365832 +0100
@@ -43,7 +43,7 @@
pkglib_PROGRAMS = ogle_mpeg_vs ogle_vout
-AM_CPPFLAGS = @TOP_INCLUDES@ @X_CFLAGS@ @MLIB_CPPFLAGS@ @JPEG_CPPFLAGS@
@XML_CFLAGS@
+AM_CPPFLAGS = @TOP_INCLUDES@ @X_CFLAGS@ @MLIB_CPPFLAGS@ @JPEG_CPPFLAGS@
@XML_CPPFLAGS@
AM_CFLAGS = @O_CFLAGS@
ogle_mpeg_vs_SOURCES = \
diff -urN ogle-0.9.2.original/mpeg2_video/Makefile.in
ogle-0.9.2/mpeg2_video/Makefile.in
diff -urN ogle-0.9.2.original/ogle/Makefile.am ogle-0.9.2/ogle/Makefile.am
--- ogle-0.9.2.original/ogle/Makefile.am 2003-11-04 11:06:59.000000000
+0000
+++ ogle-0.9.2/ogle/Makefile.am 2005-09-04 22:06:26.064925792 +0100
@@ -19,7 +19,7 @@
pkginclude_HEADERS = dvd.h dvdcontrol.h msgevents.h dvdevents.h dvdbookmarks.h
-AM_CPPFLAGS = @TOP_INCLUDES@ @XML_CFLAGS@
+AM_CPPFLAGS = @TOP_INCLUDES@ @XML_CPPFLAGS@
AM_CFLAGS = @O_CFLAGS@
libmsgevents_la_SOURCES = msgevents.c
diff -urN ogle-0.9.2.original/ogle/Makefile.in ogle-0.9.2/ogle/Makefile.in
diff -urN ogle-0.9.2.original/scripts/Makefile.in ogle-0.9.2/scripts/Makefile.in
diff -urN ogle-0.9.2.original/vmg/Makefile.am ogle-0.9.2/vmg/Makefile.am
--- ogle-0.9.2.original/vmg/Makefile.am 2003-10-14 17:58:13.000000000 +0100
+++ ogle-0.9.2/vmg/Makefile.am 2005-09-04 22:06:29.326429968 +0100
@@ -19,7 +19,7 @@
bin_PROGRAMS = ifo_dump
noinst_PROGRAMS = vmg_dump dump
-AM_CPPFLAGS = @TOP_INCLUDES@ @DVDREAD_CPPFLAGS@ @XML_CFLAGS@
+AM_CPPFLAGS = @TOP_INCLUDES@ @DVDREAD_CPPFLAGS@ @XML_CPPFLAGS@
AM_CFLAGS = @O_CFLAGS@
diff -urN ogle-0.9.2.original/vmg/Makefile.in ogle-0.9.2/vmg/Makefile.in
--
Roger Leigh
Printing on GNU/Linux? http://gimp-print.sourceforge.net/
Debian GNU/Linux http://www.debian.org/
GPG Public Key: 0x25BFB848. Please sign and encrypt your mail.
