[DVDnav-discuss] libdvdnav so version docs
Marcel J.E. Mol
marcel at mesa.nl
Fri Feb 28 23:10:59 CET 2014
Another issues I encountered is that support for large files is 'detected'
by the configure script, but as the config.h file is not included for
every source file the large file support is broken (e.g opening .iso
file larger thatn 2 GB fail on 32-bit systems).
Attached the git patch.
(also included a format-patch for my fix for .so version generation...)
Thanks,
-Marcel
On Sun, Feb 23, 2014 at 02:17:34PM +0100, Marcel J.E. Mol wrote:
> libdvdnav configure.ac domucemnts libtool version-info as current:age:revision.
> According to libtool documentation this should be current:revision:age.
> See attached patch to fix this.
>
> Thanks,
>
> -Marcel
> --
> ======-------- Marcel J.E. Mol MESA Consulting B.V.
> =======--------- ph. +31-(0)6-54724868 P.O. Box 112
> =======--------- marcel at mesa.nl 2630 AC Nootdorp
> __==== www.mesa.nl ---____U_n_i_x______I_n_t_e_r_n_e_t____ The Netherlands ____
> They couldn't think of a number, Linux user 1148 -- counter.li.org
> so they gave me a name! -- Rupert Hine -- www.ruperthine.com
> commit 848fa241f4a465414e83faffbb712a289fd00b60
> Author: Marcel Mol <marcel at mesa.nl>
> Date: Sun Feb 23 14:13:42 2014 +0100
>
> Fix configure.ac libtool version documentation
>
> diff --git a/configure.ac b/configure.ac
> index d2ab0b1..10215e0 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -50,7 +50,7 @@ dnl * DVDNAV_LT_AGE is the number of previous API versions still supported by t
> dnl * libtool has its own numbering scheme, because local library numbering schemes
> dnl are platform dependent
> dnl * in Linux, the library will be named
> -dnl libname.so.(DVDNAV_LT_CURRENT - DVDNAV_LT_AGE).DVDNAV_LT_AGE.DVDNAV_LT_REVISION
> +dnl libname.so.(DVDNAV_LT_CURRENT - DVDNAV_LT_AGE).DVDNAV_LT_REVISION.DVDNAV_LT_AGE
>
> DVDNAV_LT_CURRENT=5
> DVDNAV_LT_AGE=1
> _______________________________________________
> DVDnav-discuss mailing list
> DVDnav-discuss at mplayerhq.hu
> https://lists.mplayerhq.hu/mailman/listinfo/dvdnav-discuss
--
======-------- Marcel J.E. Mol MESA Consulting B.V.
=======--------- ph. +31-(0)6-54724868 P.O. Box 112
=======--------- marcel at mesa.nl 2630 AC Nootdorp
__==== www.mesa.nl ---____U_n_i_x______I_n_t_e_r_n_e_t____ The Netherlands ____
They couldn't think of a number, Linux user 1148 -- counter.li.org
so they gave me a name! -- Rupert Hine -- www.ruperthine.com
-------------- next part --------------
>From 7ca9f67a83e7be88e663cbcc4fe794fa21a295f7 Mon Sep 17 00:00:00 2001
From: Marcel Mol <marcel at mesa.nl>
Date: Sun, 23 Feb 2014 11:50:38 +0100
Subject: [PATCH 1/2] Fix .so version order
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 7052f52..fd2ce0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,13 +37,13 @@ dnl * DVDREAD_LT_AGE is the number of previous API versions still supported by
dnl * libtool has its own numbering scheme, because local library numbering schemes
dnl are platform dependent
dnl * in Linux, the library will be named
-dnl libname.so.(DVDREAD_LT_CURRENT - DVDREAD_LT_AGE).DVDREAD_LT_AGE.DVDREAD_LT_REVISION
+dnl libname.so.(DVDREAD_LT_CURRENT - DVDREAD_LT_AGE).DVDREAD_LT_REVISION.DVDREAD_LT_AGE
DVDREAD_LT_CURRENT=5
DVDREAD_LT_AGE=1
DVDREAD_LT_REVISION=2
-AC_SUBST([DVDREAD_LTVERSION], [$DVDREAD_LT_CURRENT:$DVDREAD_LT_AGE:$DVDREAD_LT_REVISION])
+AC_SUBST([DVDREAD_LTVERSION], [$DVDREAD_LT_CURRENT:$DVDREAD_LT_REVISION:$DVDREAD_LT_AGE])
AC_PROG_CC
--
1.8.5.3
-------------- next part --------------
>From 70605dfac6a9bd1a1597f81688d50dfae5658bbe Mon Sep 17 00:00:00 2001
From: Marcel Mol <marcel at mesa.nl>
Date: Fri, 28 Feb 2014 22:59:17 +0100
Subject: [PATCH 2/2] Include config.h for all .c files
As many compile time defines are now in config.h it should be
included in all .c files at the top.
(this allows support for large DVDs (>2GB) again.)
---
src/bitreader.c | 1 +
src/dvd_input.c | 2 +-
src/dvd_reader.c | 1 +
src/dvd_udf.c | 1 +
src/ifo_print.c | 1 +
src/md5.c | 2 +-
src/nav_print.c | 1 +
7 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/bitreader.c b/src/bitreader.c
index 9fa1b71..339ef3b 100644
--- a/src/bitreader.c
+++ b/src/bitreader.c
@@ -18,6 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+#include "config.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/src/dvd_input.c b/src/dvd_input.c
index 1018758..d7e2252 100644
--- a/src/dvd_input.c
+++ b/src/dvd_input.c
@@ -19,12 +19,12 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+#include "config.h" /* Required for HAVE_DVDCSS_DVDCSS_H */
#include <stdio.h> /* fprintf */
#include <stdlib.h> /* free */
#include <fcntl.h> /* open */
#include <unistd.h> /* lseek */
-#include "config.h" /* Required for HAVE_DVDCSS_DVDCSS_H */
#include "dvdread/dvd_reader.h" /* DVD_VIDEO_LB_LEN */
#include "dvd_input.h"
diff --git a/src/dvd_reader.c b/src/dvd_reader.c
index 07ac864..69c0011 100644
--- a/src/dvd_reader.c
+++ b/src/dvd_reader.c
@@ -20,6 +20,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+#include "config.h"
#include <sys/types.h> /* off_t */
#include <sys/stat.h> /* stat */
#include <sys/time.h> /* For the timing of dvdcss_title crack. */
diff --git a/src/dvd_udf.c b/src/dvd_udf.c
index a418ce5..dc5f9af 100644
--- a/src/dvd_udf.c
+++ b/src/dvd_udf.c
@@ -28,6 +28,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+#include "config.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/src/ifo_print.c b/src/ifo_print.c
index fffa652..2a1cc8c 100644
--- a/src/ifo_print.c
+++ b/src/ifo_print.c
@@ -16,6 +16,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+#include "config.h"
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/src/md5.c b/src/md5.c
index 59da6fe..9c5f50d 100644
--- a/src/md5.c
+++ b/src/md5.c
@@ -20,6 +20,7 @@
/* Written by Ulrich Drepper <drepper at gnu.ai.mit.edu>, 1995. */
+#include "config.h"
#include <sys/types.h>
#include <stdlib.h>
@@ -28,7 +29,6 @@
#include "md5.h"
/* #include "unlocked-io.h" */
-#include "config.h"
#ifdef WORDS_BIGENDIAN
# define SWAP(n) \
diff --git a/src/nav_print.c b/src/nav_print.c
index 2d9e6b2..28e4abd 100644
--- a/src/nav_print.c
+++ b/src/nav_print.c
@@ -23,6 +23,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+#include "config.h"
#include <stdio.h>
#include <inttypes.h>
--
1.8.5.3
More information about the DVDnav-discuss
mailing list