tags 516834 + patch
thanks
Hi,
Attached is the diff for my ogle 0.9.2-5.3 NMU.
--
Adeodato Simó dato at net.com.org.es
Debian Developer adeodato at debian.org
Truth is the most valuable thing we have, so let's economize it.
-- Mark Twain
diff -u ogle-0.9.2/debian/changelog ogle-0.9.2/debian/changelog
--- ogle-0.9.2/debian/changelog
+++ ogle-0.9.2/debian/changelog
@@ -1,3 +1,11 @@
+ogle (0.9.2-5.3) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTBFS when building against libdvdread 4.1.3. Patch sent in by peter
+ green and obtained from the NetBSD project. (Closes: #516834)
+
+ -- Adeodato Simó <d...@net.com.org.es> Wed, 04 Mar 2009 09:52:16 +0000
+
ogle (0.9.2-5.2) unstable; urgency=low
* Non-maintainer upload.
diff -u ogle-0.9.2/debian/patches/00list ogle-0.9.2/debian/patches/00list
--- ogle-0.9.2/debian/patches/00list
+++ ogle-0.9.2/debian/patches/00list
@@ -3,0 +4 @@
+70-fix_ftbfs_with_new_libdvdread
only in patch2:
unchanged:
--- ogle-0.9.2.orig/config.log
+++ ogle-0.9.2/config.log
@@ -0,0 +1,339 @@
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by configure, which was
+generated by GNU Autoconf 2.59. Invocation command line was
+
+ $ ./configure --build=x86_64-linux-gnu --host=x86_64-linux-gnu --prefix=/usr --mandir=${prefix}/share/man --sysconfdir=${prefix}/etc
+
+## --------- ##
+## Platform. ##
+## --------- ##
+
+hostname = justin
+uname -m = x86_64
+uname -r = 2.6.28-1-amd64
+uname -s = Linux
+uname -v = #1 SMP Wed Feb 18 17:16:12 UTC 2009
+
+/usr/bin/uname -p = unknown
+/bin/uname -X = unknown
+
+/bin/arch = unknown
+/usr/bin/arch -k = unknown
+/usr/convex/getsysinfo = unknown
+hostinfo = unknown
+/bin/machine = unknown
+/usr/bin/oslevel = unknown
+/bin/universe = unknown
+
+PATH: /usr/lib/ccache
+PATH: /usr/sbin
+PATH: /usr/bin
+PATH: /sbin
+PATH: /bin
+
+
+## ----------- ##
+## Core tests. ##
+## ----------- ##
+
+configure:1578: checking for a BSD-compatible install
+configure:1633: result: /usr/bin/install -c
+configure:1644: checking whether build environment is sane
+configure:1687: result: yes
+configure:1752: checking for gawk
+configure:1781: result: no
+configure:1752: checking for mawk
+configure:1768: found /usr/bin/mawk
+configure:1778: result: mawk
+configure:1788: checking whether make sets $(MAKE)
+configure:1808: result: yes
+configure:1976: checking whetherconfigure:1976: checking whether to enable maintainer-specific portions of Makefiles
+configure:1985: result: no
+configure:2configure:2024: result: x86_64-pc-linux-gnu
+configure:2032: checking host system type
+configure:2046: result: x86_64-pc-linux-gnu
+configure:2063: checking for x86_64-linux-gnu-gcc
+configure:2079: found /usr/lib/ccache/x86_64-linux-gnu-gcc
+configure:2089: result: x86_64-linux-gnu-gcc
+configure:2371: checking for C compiler version
+configure:2374: x86_64-linux-gnu-gcc --version </dev/null >&5
+x86_64-linux-gnu-gcc (Debian 4.3.3-4) 4.3.3
+Copyright (C) 2008 Free Software Foundation, Inc.
+This is free software; see the source for copying conditions. There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+configure:2377: $? = 0
+configure:2379: x86_64-linux-gnu-gcc -v </dev/null >&5
+Using built-in specs.
+Target: x86_64-linux-gnu
+Configured with: ../src/configure -v --with-pkgversion='Debian 4.3.3-4' --with-bugurl=file:///usr/share/doc/gcc-4.3/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --with-gxx-include-dir=/usr/include/c++/4.3 --program-suffix=-4.3 --enable-clocale=gnu --enable-libstdcxx-debug --enable-objc-gc --enable-mpfr --with-tune=generic --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu
+Thread model: posix
+gcc version 4.3.3 (Debian 4.3.3-4)
+configure:2382: $? = 0
+configure:2384: x86_64-linux-gnu-gcc -V </dev/null >&5
+x86_64-linux-gnu-gcc: '-V' option must have argument
+configure:2387: $? = 1
+configure:2410: checking for C compiler default output file name
+configure:2413: x86_64-linux-gnu-gcc -g -O2 conftest.c >&5
+configure:2416: $? = 0
+configure:2462: result: a.out
+coconfigure:2462: result: a.out
+configure:2467: checkiconfigure:2473: ./a.out
+configure:2476: $? = 0
+configure:2493: result: yes
+configure:2500: checking whether we are cross compiling
+configure:2502: result: no
+configure:2505: checking for sufconfigure:2505: checonfigure:2507: x86_64-linux-gnuconfigure:2507: x86_64-linux-gnu-gcc -o coconfigure:2510: $? = 0
+configure:2535: result:
+configuconfigure:2535: result:
+configure:2541: checconfigure:2562: x86_64-linux-gnuconfigure:2562: x86_64-linux-gnconftest.c:34: error: redefiniticonftest.c:34: error: redefinition of 'main'
+conftest.c:26: error: previous definition of 'main' configureconfigure:2565: $? = 1|configure: failed program was:
+| /* confdefs.h. */
+|
+| #define PACKAGE_NAME ""
+| #define PACKAGE_TARNAME ""
+| #define PACKAGE_VERSION ""
+| #define PACKAGE_STRING ""
+| #define PACKAGE_BUGREPORT ""
+| #define PACKAGE "ogle"
+| #define VERSION "0.9.2"
+| #define PACKAGE "ogle"
+| #define VERSION "0.9.2"
+|
+| #define PACKAGE_NAME ""
+| #define PACKAGE_TARNAME ""
+| #define PACKAGE_VERSION ""
+| #define PACKAGE_STRING ""
+| #define PACKAGE_BUGREPORT ""
+| #define PACKAGE "ogle"
+| #define VERSION "0.9.2"
+| #define PACKAGE "ogle"
+| #define VERSION "0.9.2"
+| /* end confdefs.h. */
+|
+| int
+| main ()
+| {
+|
+| ;
+| return 0;
+| }
+| /* end confdefs.h. */
+|
+| int
+| main ()
+| {
+|
+| ;
+| return 0;
+| }
+configure:2579: error: cannot compute suffix of object files: cannot compile
+See `config.log' for more details.
+
+## ---------------- ##
+## Cache variables. ##
+## ---------------- ##
+
+ac_cv_build=x86_64-pc-linux-gnu
+ac_cv_build_alias=x86_64-linux-gnu
+ac_cv_env_CCASFLAGS_set=
+ac_cv_env_CCASFLAGS_value=
+ac_cv_env_CCAS_set=
+ac_cv_env_CCAS_value=
+ac_cv_env_CC_set=
+ac_cv_env_CC_value=
+ac_cv_env_CFLAGS_set=set
+ac_cv_env_CFLAGS_value='-g -O2'
+ac_cv_env_CPPFLAGS_set=set
+ac_cv_env_CPPFLAGS_value=
+ac_cv_env_CPP_set=
+ac_cv_env_CPP_value=
+ac_cv_env_CXXCPP_set=
+ac_cv_env_CXXCPP_value=
+ac_cv_env_CXXFLAGS_set=set
+ac_cv_env_CXXFLAGS_value='-g -O2'
+ac_cv_env_CXX_set=
+ac_cv_env_CXX_value=
+ac_cv_env_F77_set=
+ac_cv_env_F77_value=
+ac_cv_env_FFLAGS_set=set
+ac_cv_env_FFLAGS_value='-g -O2'
+ac_cv_env_LDFLAGS_set=set
+ac_cv_env_LDFLAGS_value=
+ac_cv_env_build_alias_set=set
+ac_cv_env_build_alias_value=x86_64-linux-gnu
+ac_cv_env_host_alias_set=set
+ac_cv_env_host_alias_value=x86_64-linux-gnu
+ac_cv_env_target_alias_set=
+ac_cv_env_target_alias_value=
+ac_cv_exeext=
+ac_cv_host=x86_64-pc-linux-gnu
+ac_cv_host_alias=x86_64-linux-gnu
+ac_cv_path_install='/usr/bin/install -c'
+ac_cv_prog_AWK=mawk
+ac_cv_prog_CC=x86_64-linux-gnu-gcc
+ac_cv_prog_make_make_set=yes
+
+## ----------------- ##
+## Output variablA52_CPPFLAGS=''
+A52_LIBS=''
+ACLOA52_CPPFLAGS=''
+A52_LIBS=''
+ACLOCAL='${SHELL} /srv/nobackup/adeodato/build/ogle-0.9.2/missing --run aclocal-1.9'
+AMDEPBACKSLASH=''
+AMDEP_FALSE=''
+AMDEP_TRUE=''
+AMTAR='${SHELL} /srv/nobackup/adeodato/build/ogle-0.9.2/missing --run tar'
+AR=''
+AUTOCONF='${SHELL} /srv/nobackup/adeodato/build/ogle-0.9.2/missing --run autoconf'
+AUTOHEADER='${SHELL} /srv/nobackup/adeodato/build/ogle-0.9.2/missing --run autoheader'
+AUTOMAKE='${SHELL} /srv/nobackup/adeodato/build/ogle-0.9.2/missing --run automake-1.9'
+AWK='mawk'
+BUILDINFO=''
+CC='x86_64-linux-gnu-gcc'
+CCAS=''
+CCASFLAGS=''
+CCDEPMODE=''
+CFLAGS='-g -O2'
+CONFIG_FILE=''
+CONFIG_FILE_DTD=''
+CPP=''
+CPPFLAGS=''
+CXX=''
+CXXCPP=''
+CXXDEPMODE=''
+CXXFLAGS='-g -O2'
+CYGPATH_W='echo'
+DEFAULT_AUDIO_DEVICE=''
+DEFAULT_AUDIO_DRIVER=''
+DEFAULT_DVD_DEVICE=''
+DEFS=''
+DEPDIR=''
+DVDREAD_ALIGN_CFLAGS=''
+DVDREAD_CPPFLAGS=''
+DVDREAD_LIBS=''
+ECHO='echo'
+ECHO_C=''
+ECHO_N='-n'
+ECHO_T=''
+EGREP=''
+EXEEXT=''
+F77=''
+FFLAGS='-g -O2'
+INSTALL_DATA='${INSTALL} -m 644'
+INSTALL_PROGRAM='${INSTALL}'
+INSTALL_SCRIPT='${INSTALL}'
+INSTALL_STRIP_PROGRAM='${SHELL} $(install_sh) -c -s'
+JPEG_CPPFLAGS=''
+JPEG_LIBS=''
+LDFLAGS=''
+LIBOBJS=''
+LIBOGLEAO_LIBS=''
+LIBS=''
+LIBTOOL=''
+LN_S=''
+LTLIBOBJS=''
+MAD_CPPFLAGS=''
+MAD_LIBS=''
+MAINT='#'
+MAINTAINER_MODE_FALSE=''
+MAINTAINER_MODE_TRUE='#'
+MAKEINFO='${SHELL} /srv/nobackup/adeodato/build/ogle-0.9.2/missing --run makeinfo'
+MLIB_CPPFLAGS=''
+MLIB_LIBS=''
+MLIB_LIBS_FALSE=''
+MLIB_LIBS_TRUE=''
+OBJEXT=''
+O_CFLAGS=''
+PACKAGE='ogle'
+PACKAGE_BUGREPORT=''
+PACKAGE_NAME=''
+PACKAGE_STRING=''
+PACKAGE_TARNAME=''
+PACKAGE_VERSION=''
+PATH_SEPARATOR=':'
+RANLIB=''
+SET_MAKE=''
+SHELL='/bin/sh'
+STRIP=''
+TOP_INCLUDES=''
+USE_ALTIVEC=''
+USE_ALTIVEC_FALSE=''
+USE_ALTIVEC_TRUE=''
+USE_MMX=''
+USE_MMX_FALSE=''
+USE_MMX_TRUE=''
+USE_SPARCASM=''
+USE_SPARCASM_FALSE=''
+USE_SPARCASM_TRUE=''
+VERSION='0.9.2'
+XEXT_LIB=''
+XF86VIDMODE_LIBS=''
+XINERAMA_LIBS=''
+XML2_CONFIG=''
+XML_CPPFLAGS=''
+XML_LIBS=''
+X_CFLAGS=''
+X_EXTRA_LIBS=''
+X_LIBS=''
+X_PRE_LIBS=''
+ac_ct_AR=''
+ac_ct_CC=''
+ac_ct_CXX=''
+ac_ct_F77=''
+ac_ct_RANLIB=''
+ac_ct_STRIP=''
+am__fastdepCC_FALSE=''
+am__fastdepCC_TRUE=''
+am__fastdepCXX_FALSE=''
+am__fastdepCXX_TRUE=''
+am__include=''
+am__leading_dot='.'
+am__quote=''
+am__tar='${AMTAR} chof - "$$tardir"'
+am__untar='${AMTAR} xf -'
+bindir='${exec_prefix}/bin'
+build='x86_64-pc-linux-gnu'
+build_alias='x86_64-linux-gnu'
+build_cpu='x86_64'
+build_os='linux-gnu'
+build_vendor='pc'
+datadir='${prefix}/share'
+exec_prefix='NONE'
+host='x86_64-pc-linux-gnu'
+host_alias='x86_64-linux-gnu'
+host_cpu='x86_64'
+host_os='linux-gnu'
+host_vendor='pc'
+includedir='${prefix}/include'
+infodir='${prefix}/info'
+install_sh='/srv/nobackup/adeodato/build/ogle-0.9.2/install-sh'
+libdir='${exec_prefix}/lib'
+libexecdir='${exec_prefix}/libexec'
+localstatedir='${prefix}/var'
+mandir='${prefix}/share/man'
+mkdir_p='mkdir -p --'
+oldincludedir='/usr/include'
+prefix='/usr'
+program_transform_name='s,x,x,'
+sbindir='${exec_prefix}/sbin'
+sharedstatedir='${prefix}/com'
+sysconfdir='${prefix}/etc'
+target_alias=''
+
+configure: exit 1
+ ##
+
+#define PACKAGE "ogle"
+#define PACKAGE "ogle"
+#define PACKAGE_BUGREPORT ""
+#define PACKAGE_NAME ""
+#define PACKAGE_STRING ""
+#define PACKAGE_TARNAME ""
+#define PACKAGE_VERSION ""
+#define VERSION "0.9.2"
+#define VERSION "0.9.2"
+
+configure: exit 1
only in patch2:
unchanged:
--- ogle-0.9.2.orig/debian/patches/70-fix_ftbfs_with_new_libdvdread.dpatch
+++ ogle-0.9.2/debian/patches/70-fix_ftbfs_with_new_libdvdread.dpatch
@@ -0,0 +1,140 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 70-ifo-fix.patch.dpatch provided by peter green <plugw...@p10link.net>
+## based on one by <raymond.me...@rambler.ru>.
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch to deal with some renamed "ifo" functions in libdvdread-4.1.3.
+## DP: Based on the patch at
+## DP: http://mail-index.netbsd.org/pkgsrc-bugs/2009/01/26/msg030603.html
+## DP: No substatial changes from that patch, just fixing up of some failures
+## DP: to apply.
+
+...@dpatch@
+diff -urNad ogle-0.9.2~/vmg/ifo_dump.c ogle-0.9.2/vmg/ifo_dump.c
+--- ogle-0.9.2~/vmg/ifo_dump.c 2009-03-03 01:17:07.000000000 +0000
++++ ogle-0.9.2/vmg/ifo_dump.c 2009-03-03 01:18:40.000000000 +0000
+@@ -65,38 +65,38 @@
+ if(h->vmgi_mat != NULL) {
+
+ printf("VMG top level\n-------------\n");
+- ifoPrint_VMGI_MAT(h->vmgi_mat);
++ ifo_print_VMGI_MAT(h->vmgi_mat);
+
+ printf("\nFirst Play PGC\n--------------\n");
+- ifoPrint_PGC(h->first_play_pgc);
++ ifo_print_PGC(h->first_play_pgc);
+
+ printf("\nTitle Track search pointer table\n");
+ printf( "------------------------------------------------\n");
+- ifoPrint_TT_SRPT(h->tt_srpt);
++ ifo_print_TT_SRPT(h->tt_srpt);
+
+ printf("\nMenu PGCI Unit table\n");
+ printf( "--------------------\n");
+ if(h->vmgi_mat->vmgm_pgci_ut != 0) {
+- ifoPrint_PGCI_UT(h->pgci_ut);
++ ifo_print_PGCI_UT(h->pgci_ut);
+ } else
+ printf("No Menu PGCI Unit table present\n");
+
+ printf("\nParental Manegment Information table\n");
+ printf( "------------------------------------\n");
+ if(h->vmgi_mat->ptl_mait != 0) {
+- ifoPrint_PTL_MAIT(h->ptl_mait);
++ ifo_print_PTL_MAIT(h->ptl_mait);
+ } else
+ printf("No Parental Management Information present\n");
+
+ printf("\nVideo Title Set Attribute Table\n");
+ printf( "-------------------------------\n");
+- ifoPrint_VTS_ATRT(h->vts_atrt);
++ ifo_print_VTS_ATRT(h->vts_atrt);
+
+
+ printf("\nText Data Manager Information\n");
+ printf( "-----------------------------\n");
+ if(h->vmgi_mat->txtdt_mgi != 0) {
+- //ifoPrint_TXTDT_MGI(h->txtdt_mgi);
++ //ifo_print_TXTDT_MGI(h->txtdt_mgi);
+ printf("Can't print Text Data Manager Information yet\n");
+ } else
+ printf("No Text Data Manager Information present\n");
+@@ -106,14 +106,14 @@
+ printf("\nCell Address table\n");
+ printf( "-----------------\n");
+ if(h->vmgi_mat->vmgm_c_adt != 0) {
+- ifoPrint_C_ADT(h->menu_c_adt);
++ ifo_print_C_ADT(h->menu_c_adt);
+ } else
+ printf("No Cell Address table present\n");
+
+ printf("\nVideo Title set Menu VOBU address map\n");
+ printf( "-----------------\n");
+ if(h->vmgi_mat->vmgm_vobu_admap != 0) {
+- ifoPrint_VOBU_ADMAP(h->menu_vobu_admap);
++ ifo_print_VOBU_ADMAP(h->menu_vobu_admap);
+ } else
+ printf("No Menu VOBU address map present\n");
+ }
+@@ -122,20 +122,20 @@
+ if(h->vtsi_mat != NULL) {
+
+ printf("VTS top level\n-------------\n");
+- ifoPrint_VTSI_MAT(h->vtsi_mat);
++ ifo_print_VTSI_MAT(h->vtsi_mat);
+
+ printf("\nPart of title search pointer table information\n");
+ printf( "----------------------------------------------\n");
+- ifoPrint_VTS_PTT_SRPT(h->vts_ptt_srpt);
++ ifo_print_VTS_PTT_SRPT(h->vts_ptt_srpt);
+
+ printf("\nPGCI Unit table\n");
+ printf( "--------------------\n");
+- ifoPrint_PGCIT(h->vts_pgcit);
++ ifo_print_PGCIT(h->vts_pgcit);
+
+ printf("\nMenu PGCI Unit table\n");
+ printf( "--------------------\n");
+ if(h->vtsi_mat->vtsm_pgci_ut != 0) {
+- ifoPrint_PGCI_UT(h->pgci_ut);
++ ifo_print_PGCI_UT(h->pgci_ut);
+ } else
+ printf("No Menu PGCI Unit table present\n");
+
+@@ -144,31 +144,31 @@
+ printf("\nTime Map table\n");
+ printf( "-----------------\n");
+ if(h->vtsi_mat->vts_tmapt != 0) {
+- ifoPrint_VTS_TMAPT(h->vts_tmapt);
++ ifo_print_VTS_TMAPT(h->vts_tmapt);
+ } else
+ printf("No Time Map table present\n");
+
+ printf("\nMenu Cell Address table\n");
+ printf( "-----------------\n");
+ if(h->vtsi_mat->vtsm_c_adt != 0) {
+- ifoPrint_C_ADT(h->menu_c_adt);
++ ifo_print_C_ADT(h->menu_c_adt);
+ } else
+ printf("No Cell Address table present\n");
+
+ printf("\nVideo Title Set Menu VOBU address map\n");
+ printf( "-----------------\n");
+ if(h->vtsi_mat->vtsm_vobu_admap != 0) {
+- ifoPrint_VOBU_ADMAP(h->menu_vobu_admap);
++ ifo_print_VOBU_ADMAP(h->menu_vobu_admap);
+ } else
+ printf("No Menu VOBU address map present\n");
+
+ printf("\nCell Address table\n");
+ printf( "-----------------\n");
+- ifoPrint_C_ADT(h->vts_c_adt);
++ ifo_print_C_ADT(h->vts_c_adt);
+
+ printf("\nVideo Title Set VOBU address map\n");
+ printf( "-----------------\n");
+- ifoPrint_VOBU_ADMAP(h->vts_vobu_admap);
++ ifo_print_VOBU_ADMAP(h->vts_vobu_admap);
+
+ }
+ }
