TDE
/
k9copy
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/k9copy
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix incorrect use of dvdread includes.

Browse Source 
It seems that the library has been designed for use includes in the form
"#include <dvdread/...>" while we used includes without the "dvdread/" prefix.
This caused that instead of using the standard path detected from pkg-config,
the expected path had to be added to to -I flag.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 9f7c0362e2)
r14.1.x
Slávek Banko 1 year ago
parent ba09a974ba
commit 0984c8a873
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668
11 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File

2
k9Mplayer/Makefile.am
Unescape View File

@ -1,4 +1,4 @@
INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/libk9copy $(all_includes) INCLUDES = -I$(top_srcdir)/libk9copy $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO
noinst_LTLIBRARIES = libk9mplayer.la noinst_LTLIBRARIES = libk9mplayer.la

2
k9author/Makefile.am
Unescape View File

@ -14,5 +14,5 @@ noinst_HEADERS = k9avidecode.h k9avifile.h k9canvasselection.h k9chapteredit.h \
k9import.h k9importfiles.h k9lvitemimport.h k9menu.h k9menubutton.h k9menuedit.h \ k9import.h k9importfiles.h k9lvitemimport.h k9menu.h k9menubutton.h k9menuedit.h \
k9menueditor.h k9newdvd.h k9newtitle.h k9title.h k9menueditor.h k9newdvd.h k9newtitle.h k9title.h
libk9author_la_LIBADD = $(top_builddir)/libk9copy/libk9copy.la $(LIB_TDEUI) libk9author_la_LIBADD = $(top_builddir)/libk9copy/libk9copy.la $(LIB_TDEUI)
INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9devices \ INCLUDES = -I$(top_srcdir)/k9devices \
-I$(top_srcdir)/k9vamps -I$(top_srcdir)/libk9copy -I$(top_srcdir)/src $(all_includes) -I$(top_srcdir)/k9vamps -I$(top_srcdir)/libk9copy -I$(top_srcdir)/src $(all_includes)

2
k9decmpeg/Makefile.am
Unescape View File

@ -12,7 +12,7 @@ libk9decmpeg_la_SOURCES = alloc.cpp attributes.h bswap.h convert_internal.h \
motion_comp_altivec.cpp motion_comp.cpp motion_comp_mmx.cpp motion_comp_vis.cpp mpeg2convert.h \ motion_comp_altivec.cpp motion_comp.cpp motion_comp_mmx.cpp motion_comp_vis.cpp mpeg2convert.h \
mpeg2.h mpeg2_internal.h rgb.cpp rgb_mmx.cpp rgb_vis.cpp slice.cpp tendra.h \ mpeg2.h mpeg2_internal.h rgb.cpp rgb_mmx.cpp rgb_vis.cpp slice.cpp tendra.h \
uyvy.cpp video_out.h vis.h vlc.h k9decodethread.cpp k9plaympeg2.cpp uyvy.cpp video_out.h vis.h vlc.h k9decodethread.cpp k9plaympeg2.cpp
INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9vamps \ INCLUDES = -I$(top_srcdir)/k9vamps \
-I$(top_srcdir)/libdvdnav -I$(top_srcdir)/libk9copy -I$(top_srcdir)/libdvdnav -I$(top_srcdir)/libk9copy
noinst_HEADERS = k9decodethread.h k9plaympeg2.h noinst_HEADERS = k9decodethread.h k9plaympeg2.h

2
k9devices/Makefile.am
Unescape View File

@ -1,4 +1,4 @@
INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/libk9copy $(K3B_INCS) -I$(includedir) $(all_includes) INCLUDES = -I$(top_srcdir)/libk9copy $(K3B_INCS) -I$(includedir) $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO
libk9devices_la_LDFLAGS = $(all_libraries) libk9devices_la_LDFLAGS = $(all_libraries)
noinst_LTLIBRARIES = libk9devices.la noinst_LTLIBRARIES = libk9devices.la

2
k9vamps/Makefile.am
Unescape View File

@ -7,6 +7,6 @@ libk9vamps_la_LDFLAGS = $(all_libraries)
noinst_LTLIBRARIES = libk9vamps.la noinst_LTLIBRARIES = libk9vamps.la
libk9vamps_la_SOURCES = cputest.cpp getvlc.h k9fifo.cpp k9requant.cpp \ libk9vamps_la_SOURCES = cputest.cpp getvlc.h k9fifo.cpp k9requant.cpp \
k9vamps.cpp k9vamps.h putvlc.h qTable.h tcmemcpy.cpp k9vamps.cpp k9vamps.h putvlc.h qTable.h tcmemcpy.cpp
INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9vamps \ INCLUDES = -I$(top_srcdir)/k9vamps \
-I$(top_srcdir)/libk9copy -I$(top_srcdir)/libk9copy
noinst_HEADERS = k9requant.h ac.h k9fifo.h noinst_HEADERS = k9requant.h ac.h k9fifo.h

2
libdvdnav/Makefile.am
Unescape View File

@ -11,4 +11,4 @@ noinst_HEADERS = common.h dvdread.h
INCLUDES = -I/usr/include/dvdread INCLUDES =

10
libdvdnav/common.h
Unescape View File

@ -9,8 +9,8 @@
#include <stdint.h> #include <stdint.h>
#endif #endif
#include "ifo_types.h" #include <dvdread/ifo_types.h>
#include "dvd_reader.h" #include <dvdread/dvd_reader.h>
#include "ifo_read.h" #include <dvdread/ifo_read.h>
#include "nav_read.h" #include <dvdread/nav_read.h>
#include "nav_types.h" #include <dvdread/nav_types.h>

2
libdvdnav/dvdnav_internal.h
Unescape View File

@ -94,7 +94,7 @@ typedef struct read_cache_s read_cache_t;
/* /*
* These are defined here because they are * These are defined here because they are
* not in ifo_types.h, they maybe one day * not in dvdread/ifo_types.h, they maybe one day
*/ */
#ifndef audio_status_t #ifndef audio_status_t

2
libk9copy/Makefile.am
Unescape View File

@ -24,6 +24,6 @@ noinst_HEADERS = bswap.h k9audiocodecs.h k9backupdlg.h k9burndvd.h k9cell.h \
k9saveimage.h k9script.h k9titleencopt.h k9tools.h k9videocodecs.h k9saveimage.h k9script.h k9titleencopt.h k9tools.h k9videocodecs.h
INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9decmpeg \ INCLUDES = -I$(top_srcdir)/k9decmpeg \
-I$(top_srcdir)/k9vamps -I$(top_srcdir)/libdvdnav -I$(top_srcdir)/k9vamps -I$(top_srcdir)/libdvdnav
libk9copy_la_LDFLAGS = $(all_libraries) libk9copy_la_LDFLAGS = $(all_libraries)

10
libk9copy/k9common.h
Unescape View File

@ -28,11 +28,11 @@
#ifdef __FreeBSD__ #ifdef __FreeBSD__
#include <osreldate.h> #include <osreldate.h>
#endif #endif
#include "ifo_types.h" #include <dvdread/ifo_types.h>
#include "dvd_reader.h" #include <dvdread/dvd_reader.h>
#include "ifo_read.h" #include <dvdread/ifo_read.h>
#include "nav_read.h" #include <dvdread/nav_read.h>
#include "nav_types.h" #include <dvdread/nav_types.h>
#include <tqobject.h> #include <tqobject.h>
#include <tqobjectlist.h> #include <tqobjectlist.h>

2
src/Makefile.am
Unescape View File

@ -1,5 +1,5 @@
# set the include path for X, qt and KDE # set the include path for X, qt and KDE
INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9Mplayer \ INCLUDES = -I$(top_srcdir)/k9Mplayer \
-I$(top_srcdir)/k9author -I$(top_srcdir)/k9decmpeg -I$(top_srcdir)/k9devices \ -I$(top_srcdir)/k9author -I$(top_srcdir)/k9decmpeg -I$(top_srcdir)/k9devices \
-I$(top_srcdir)/k9vamps -I$(top_srcdir)/libdvdnav -I$(top_srcdir)/libk9copy -I$(includedir) $(all_includes) -I$(top_srcdir)/k9vamps -I$(top_srcdir)/libdvdnav -I$(top_srcdir)/libk9copy -I$(includedir) $(all_includes)

Write Preview
Loading…
Cancel
Save