Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
L
libdvdnav
Manage
Activity
Members
Labels
Plan
Issues
10
Issue boards
Milestones
Code
Merge requests
10
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
libdvdnav
Compare revisions
ac7327d23e67d6358a34b39af0a71ffa6c915520 to 054f205720b543013a0859df5649d8d3837569e8
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
videolan/libdvdnav
Select target project
No results found
054f205720b543013a0859df5649d8d3837569e8
Select Git revision
Branches
buildsystem-cleanup
master
Tags
5.0.0
5.0.1
5.0.2
5.0.3
6.0.0
6.0.1
6.1.0
6.1.1
Swap
Target
videolan/libdvdnav
Select target project
videolan/libdvdnav
thresh/libdvdnav
robUx4/libdvdnav
jsgh/libdvdnav
chouquette/libdvdnav
jbk/libdvdnav
martymac/libdvdnav
Mathias_Couder/libdvdnav
DimitriPapadopoulos/libdvdnav
hpi/libdvdnav
miguelborgesdefreitas/libdvdnav
dmahurin/libdvdnav
ATinySpaceMarine/libdvdnav
masstock/libdvdnav
14 results
ac7327d23e67d6358a34b39af0a71ffa6c915520
Select Git revision
Branches
buildsystem-cleanup
master
Tags
5.0.0
5.0.1
5.0.2
5.0.3
6.0.0
6.0.1
6.1.0
6.1.1
Show changes
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source (2)
configure.ac: use variable for dvdread version requirement
· 703b0ee9
François Cartegnie
authored
4 years ago
703b0ee9
configure.ac: use variable for dvdnav version
· 054f2057
François Cartegnie
authored
4 years ago
054f2057
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
Makefile.am
+6
-2
6 additions, 2 deletions
Makefile.am
configure.ac
+5
-1
5 additions, 1 deletion
configure.ac
misc/dvdnav.pc.in
+1
-1
1 addition, 1 deletion
misc/dvdnav.pc.in
src/dvdnav/dvdnav.h
+1
-2
1 addition, 2 deletions
src/dvdnav/dvdnav.h
src/dvdnav/version.h.in
+35
-0
35 additions, 0 deletions
src/dvdnav/version.h.in
with
48 additions
and
6 deletions
Makefile.am
View file @
054f2057
ACLOCAL_AMFLAGS
=
-Im4
AM_CPPFLAGS
=
-I
$(
top_srcdir
)
/src
$(
THREAD_CFLAGS
)
$(
DVDREAD_CFLAGS
)
AM_CPPFLAGS
=
-I
$(
top_srcdir
)
/src
\
-I
$(
top_builddir
)
/src/dvdnav
\
$(
THREAD_CFLAGS
)
\
$(
DVDREAD_CFLAGS
)
dist_doc_DATA
=
AUTHORS ChangeLog COPYING README TODO
...
...
@@ -46,7 +49,8 @@ pkgincludedir = $(includedir)/dvdnav
pkginclude_HEADERS
=
\
src/dvdnav/dvdnav.h
\
src/dvdnav/dvdnav_events.h
\
src/dvdnav/dvd_types.h
src/dvdnav/dvd_types.h
\
src/dvdnav/version.h
pkgconfigdir
=
$(
libdir
)
/pkgconfig
pkgconfig_DATA
=
misc/dvdnav.pc
...
...
This diff is collapsed.
Click to expand it.
configure.ac
View file @
054f2057
...
...
@@ -27,9 +27,12 @@ DVDNAV_MINOR="dvdnav_minor"
DVDNAV_SUB="dvdnav_sub"
DVDNAV_PRE="dvdnav_pre"
DVDREAD_MIN_VERSION="6.0.0"
AC_SUBST(DVDNAV_MAJOR)
AC_SUBST(DVDNAV_MINOR)
AC_SUBST(DVDNAV_SUB)
AC_SUBST(DVDREAD_MIN_VERSION)
dnl The libtool version numbers (DVDNAV_LT_*); Don't even think about faking this!
dnl
...
...
@@ -94,7 +97,7 @@ esac
AC_SUBST(THREAD_LIBS)
AC_SUBST(THREAD_CFLAGS)
PKG_CHECK_MODULES([DVDREAD], [dvdread >=
6.0.0
])
PKG_CHECK_MODULES([DVDREAD], [dvdread >=
${DVDREAD_MIN_VERSION}
])
dnl ---------------------------------------------
dnl Check for bitfield compiler flag
...
...
@@ -124,4 +127,5 @@ AC_OUTPUT([
Makefile
misc/dvdnav.pc
misc/libdvdnav.spec
src/dvdnav/version.h
])
This diff is collapsed.
Click to expand it.
misc/dvdnav.pc.in
View file @
054f2057
...
...
@@ -7,6 +7,6 @@ Name: libdvdnav
Description: DVD Navigation library
Version: @VERSION@
Requires.private: dvdread >=
4.1.2
Requires.private: dvdread >=
@DVDREAD_MIN_VERSION@
Cflags: -I${includedir} @THREAD_CFLAGS@
Libs: -L${libdir} -ldvdnav @THREAD_LIBS@
This diff is collapsed.
Click to expand it.
src/dvdnav/dvdnav.h
View file @
054f2057
...
...
@@ -26,12 +26,11 @@
#ifndef LIBDVDNAV_DVDNAV_H
#define LIBDVDNAV_DVDNAV_H
#define DVDNAV_VERSION 50400
#ifdef __cplusplus
extern
"C"
{
#endif
#include
"version.h"
#include
<dvdnav/dvd_types.h>
#include
<dvdread/dvd_reader.h>
#include
<dvdread/nav_types.h>
...
...
This diff is collapsed.
Click to expand it.
src/dvdnav/version.h.in
0 → 100644
View file @
054f2057
/*
* This file is part of libdvdnav, a DVD navigation library.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*/
#ifndef LIBDVDNAV_VERSION_H
#define LIBDVDNAV_VERSION_H
#define DVDNAV_VERSION_CODE(major, minor, micro) \
(((major) * 10000) + \
((minor) * 100) + \
((micro) * 1))
#define DVDNAV_VERSION_MAJOR @DVDNAV_MAJOR@
#define DVDNAV_VERSION_MINOR @DVDNAV_MINOR@
#define DVDNAV_VERSION_MICRO @DVDNAV_SUB@
#define DVDNAV_VERSION_STRING "@DVDNAV_MAJOR@.@DVDNAV_MINOR@.@DVDNAV_SUB@"
#define DVDNAV_VERSION \
DVDNAV_VERSION_CODE(DVDNAV_VERSION_MAJOR, DVDNAV_VERSION_MINOR, DVDNAV_VERSION_MICRO)
#endif
This diff is collapsed.
Click to expand it.