ced81478 | 2019-05-01 23:32:05 | Slávek Banko |
Fix FTBFS for build with --enable-final. Signed-off-by: Slávek Banko <slavek.banko@...> |
||
M k9decmpeg/attributes.h M k9decmpeg/convert_internal.h M k9decmpeg/kdecmpeg2.cpp M k9decmpeg/mmx.h M k9decmpeg/mpeg2_internal.h M k9decmpeg/tendra.h M k9decmpeg/video_out.h M k9decmpeg/vis.h M k9decmpeg/vlc.h M libk9copy/k9dvdauthor.cpp M libk9copy/k9dvdchapter.cpp M libk9copy/k9dvdprogress.cpp M libk9copy/k9dvdsize.cpp M libk9copy/k9dvdtitle.cpp M libk9copy/k9dvdtitleset.cpp M libk9copy/k9ifo2.cpp M src/Makefile.am M src/k9copy.cpp M src/k9glwidget.cpp M src/kviewmpeg2.cpp |
||
k9decmpeg/attributes.hdiff --git a/k9decmpeg/attributes.h b/k9decmpeg/attributes.h index 1c58c0a..8a64fcf 100644 --- a/k9decmpeg/attributes.h +++ b/k9decmpeg/attributes.h @@ -21,6 +21,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef ATTRIBUTES_H +#define ATTRIBUTES_H + /* use gcc attribs to align critical data structures */ #ifdef ATTRIBUTE_ALIGNED_MAX #define ATTR_ALIGN(align) __attribute__ ((__aligned__ ((ATTRIBUTE_ALIGNED_MAX < align) ? ATTRIBUTE_ALIGNED_MAX : align))) @@ -35,3 +38,5 @@ #define likely(x) (x) #define unlikely(x) (x) #endif + +#endif /* ATTRIBUTES_H */ k9decmpeg/convert_internal.hdiff --git a/k9decmpeg/convert_internal.h b/k9decmpeg/convert_internal.h index 02615fc..07b6608 100644 --- a/k9decmpeg/convert_internal.h +++ b/k9decmpeg/convert_internal.h @@ -21,6 +21,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef CONVERT_INTERNAL_H +#define CONVERT_INTERNAL_H + typedef struct { uint8_t * rgb_ptr; int width; @@ -39,3 +42,5 @@ const mpeg2_sequence_t * seq); mpeg2convert_copy_t * mpeg2convert_rgb_vis (int bpp, int mode, const mpeg2_sequence_t * seq); + +#endif /* CONVERT_INTERNAL_H */ k9decmpeg/kdecmpeg2.cppdiff --git a/k9decmpeg/kdecmpeg2.cpp b/k9decmpeg/kdecmpeg2.cpp index 662eb28..597e3de 100644 --- a/k9decmpeg/kdecmpeg2.cpp +++ b/k9decmpeg/kdecmpeg2.cpp @@ -438,3 +438,4 @@ m_pause=true; } +#include "kdecmpeg2.moc" k9decmpeg/mmx.hdiff --git a/k9decmpeg/mmx.h b/k9decmpeg/mmx.h index a410caa..01943de 100644 --- a/k9decmpeg/mmx.h +++ b/k9decmpeg/mmx.h @@ -27,6 +27,9 @@ * values by ULL, lest they be truncated by the compiler) */ +#ifndef MMX_H +#define MMX_H + typedef union { long long q; /* Quadword (64-bit) value */ unsigned long long uq; /* Unsigned Quadword */ @@ -261,3 +264,5 @@ #define pshufw_r2r(regs,regd,imm) mmx_r2ri(pshufw, regs, regd, imm) #define sfence() __asm__ __volatile__ ("sfence\n\t") + +#endif /* MMX_H */ k9decmpeg/mpeg2_internal.hdiff --git a/k9decmpeg/mpeg2_internal.h b/k9decmpeg/mpeg2_internal.h index 7e6c1df..1cb483c 100644 --- a/k9decmpeg/mpeg2_internal.h +++ b/k9decmpeg/mpeg2_internal.h @@ -21,6 +21,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef MPEG2_INTERNAL_H +#define MPEG2_INTERNAL_H + /* macroblock modes */ #define MACROBLOCK_INTRA 1 #define MACROBLOCK_PATTERN 2 @@ -298,3 +301,5 @@ extern mpeg2_mc_t mpeg2_mc_altivec; extern mpeg2_mc_t mpeg2_mc_alpha; extern mpeg2_mc_t mpeg2_mc_vis; + +#endif /* MPEG2_INTERNAL_H */ k9decmpeg/tendra.hdiff --git a/k9decmpeg/tendra.h b/k9decmpeg/tendra.h index 7dd1179..0a3cfca 100644 --- a/k9decmpeg/tendra.h +++ b/k9decmpeg/tendra.h @@ -21,6 +21,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef TENDRA_H +#define TENDRA_H + #pragma TenDRA begin #pragma TenDRA longlong type warning @@ -33,3 +36,5 @@ int TenDRA; #endif /* TenDRA_check */ + +#endif /* TENDRA_H */ k9decmpeg/video_out.hdiff --git a/k9decmpeg/video_out.h b/k9decmpeg/video_out.h index 8962726..0189910 100644 --- a/k9decmpeg/video_out.h +++ b/k9decmpeg/video_out.h @@ -21,6 +21,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef VIDEO_OUT_H +#define VIDEO_OUT_H + struct mpeg2_sequence_s; struct mpeg2_convert_init_s; typedef struct { @@ -56,3 +59,5 @@ /* return NULL terminated array of all drivers */ vo_driver_t const * vo_drivers (void); + +#endif /* VIDEO_OUT_H */ k9decmpeg/vis.hdiff --git a/k9decmpeg/vis.h b/k9decmpeg/vis.h index f2cbb6b..2b57336 100644 --- a/k9decmpeg/vis.h +++ b/k9decmpeg/vis.h @@ -41,6 +41,9 @@ * the assembler to keep the binary from becoming tainted. */ +#ifndef VIS_H +#define VIS_H + #define vis_opc_base ((0x1 << 31) | (0x36 << 19)) #define vis_opf(X) ((X) << 5) #define vis_sreg(X) (X) @@ -326,3 +329,5 @@ /* Pixel component distance. */ #define vis_pdist(rs1,rs2,rd) vis_dd2d(0x3e, rs1, rs2, rd) + +#endif /* VIS_H */ k9decmpeg/vlc.hdiff --git a/k9decmpeg/vlc.h b/k9decmpeg/vlc.h index f82e595..7f19802 100644 --- a/k9decmpeg/vlc.h +++ b/k9decmpeg/vlc.h @@ -21,6 +21,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef VLC_H +#define VLC_H + #define GETWORD(bit_buf,shift,bit_ptr) \ do { \ bit_buf |= ((bit_ptr[0] << 8) | bit_ptr[1]) << (shift); \ @@ -427,3 +430,5 @@ { 7, 7}, { 7, 7}, { 7, 7}, { 7, 7}, { 7, 7}, { 7, 7}, { 7, 7}, { 7, 7} }; + +#endif /* VLC_H */ libk9copy/k9dvdauthor.cppdiff --git a/libk9copy/k9dvdauthor.cpp b/libk9copy/k9dvdauthor.cpp index 92693fd..e6023e7 100644 --- a/libk9copy/k9dvdauthor.cpp +++ b/libk9copy/k9dvdauthor.cpp @@ -589,3 +589,5 @@ bool k9DVDAuthor::getError() { return error; } + +#include "k9dvdauthor.moc" libk9copy/k9dvdchapter.cppdiff --git a/libk9copy/k9dvdchapter.cpp b/libk9copy/k9dvdchapter.cpp index 9268bbe..16d76d4 100644 --- a/libk9copy/k9dvdchapter.cpp +++ b/libk9copy/k9dvdchapter.cpp @@ -67,3 +67,5 @@ m_selected = _value; } + +#include "k9dvdchapter.moc" libk9copy/k9dvdprogress.cppdiff --git a/libk9copy/k9dvdprogress.cpp b/libk9copy/k9dvdprogress.cpp index 9a35821..34b9077 100644 --- a/libk9copy/k9dvdprogress.cpp +++ b/libk9copy/k9dvdprogress.cpp @@ -60,3 +60,5 @@ ce->ignore(); return; } + +#include "k9dvdprogress.moc" libk9copy/k9dvdsize.cppdiff --git a/libk9copy/k9dvdsize.cpp b/libk9copy/k9dvdsize.cpp index 0e671b3..c830683 100644 --- a/libk9copy/k9dvdsize.cpp +++ b/libk9copy/k9dvdsize.cpp @@ -40,4 +40,4 @@ { } - +#include "k9dvdsize.moc" libk9copy/k9dvdtitle.cppdiff --git a/libk9copy/k9dvdtitle.cpp b/libk9copy/k9dvdtitle.cpp index 21a8e79..cfe8019 100644 --- a/libk9copy/k9dvdtitle.cpp +++ b/libk9copy/k9dvdtitle.cpp @@ -498,6 +498,4 @@ } } - - - +#include "k9dvdtitle.moc" libk9copy/k9dvdtitleset.cppdiff --git a/libk9copy/k9dvdtitleset.cpp b/libk9copy/k9dvdtitleset.cpp index aa0e50a..a319b98 100644 --- a/libk9copy/k9dvdtitleset.cpp +++ b/libk9copy/k9dvdtitleset.cpp @@ -136,3 +136,4 @@ return newId; } +#include "k9dvdtitleset.moc" libk9copy/k9ifo2.cppdiff --git a/libk9copy/k9ifo2.cpp b/libk9copy/k9ifo2.cpp index 8c73213..1d5fec8 100644 --- a/libk9copy/k9ifo2.cpp +++ b/libk9copy/k9ifo2.cpp @@ -931,3 +931,5 @@ } } + +#include "k9ifo2.moc" src/Makefile.amdiff --git a/src/Makefile.am b/src/Makefile.am index 875aca1..89f8b93 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -23,7 +23,7 @@ bin_PROGRAMS = k9copy # the application source, library search path, and link libraries -k9copy_SOURCES = configDlg.ui images.h k9copy.cpp k9copy.png k9glwidget.cpp \ +k9copy_SOURCES = configDlg.ui images.h k9copy.cpp k9glwidget.cpp \** Diff limit reached (max: 250 lines) ** |