Fix FTBFS for build with --enable-final.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/1/head
Slávek Banko 5 years ago
parent 2456e6ce61
commit ced814784b
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -21,6 +21,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * 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 */ /* use gcc attribs to align critical data structures */
#ifdef ATTRIBUTE_ALIGNED_MAX #ifdef ATTRIBUTE_ALIGNED_MAX
#define ATTR_ALIGN(align) __attribute__ ((__aligned__ ((ATTRIBUTE_ALIGNED_MAX < align) ? ATTRIBUTE_ALIGNED_MAX : align))) #define ATTR_ALIGN(align) __attribute__ ((__aligned__ ((ATTRIBUTE_ALIGNED_MAX < align) ? ATTRIBUTE_ALIGNED_MAX : align)))
@ -35,3 +38,5 @@
#define likely(x) (x) #define likely(x) (x)
#define unlikely(x) (x) #define unlikely(x) (x)
#endif #endif
#endif /* ATTRIBUTES_H */

@ -21,6 +21,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef CONVERT_INTERNAL_H
#define CONVERT_INTERNAL_H
typedef struct { typedef struct {
uint8_t * rgb_ptr; uint8_t * rgb_ptr;
int width; int width;
@ -39,3 +42,5 @@ mpeg2convert_copy_t * mpeg2convert_rgb_mmx (int bpp, int mode,
const mpeg2_sequence_t * seq); const mpeg2_sequence_t * seq);
mpeg2convert_copy_t * mpeg2convert_rgb_vis (int bpp, int mode, mpeg2convert_copy_t * mpeg2convert_rgb_vis (int bpp, int mode,
const mpeg2_sequence_t * seq); const mpeg2_sequence_t * seq);
#endif /* CONVERT_INTERNAL_H */

@ -438,3 +438,4 @@ void kDecMPEG2::pause() {
m_pause=true; m_pause=true;
} }
#include "kdecmpeg2.moc"

@ -27,6 +27,9 @@
* values by ULL, lest they be truncated by the compiler) * values by ULL, lest they be truncated by the compiler)
*/ */
#ifndef MMX_H
#define MMX_H
typedef union { typedef union {
long long q; /* Quadword (64-bit) value */ long long q; /* Quadword (64-bit) value */
unsigned long long uq; /* Unsigned Quadword */ unsigned long long uq; /* Unsigned Quadword */
@ -261,3 +264,5 @@ typedef union {
#define pshufw_r2r(regs,regd,imm) mmx_r2ri(pshufw, regs, regd, imm) #define pshufw_r2r(regs,regd,imm) mmx_r2ri(pshufw, regs, regd, imm)
#define sfence() __asm__ __volatile__ ("sfence\n\t") #define sfence() __asm__ __volatile__ ("sfence\n\t")
#endif /* MMX_H */

@ -21,6 +21,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef MPEG2_INTERNAL_H
#define MPEG2_INTERNAL_H
/* macroblock modes */ /* macroblock modes */
#define MACROBLOCK_INTRA 1 #define MACROBLOCK_INTRA 1
#define MACROBLOCK_PATTERN 2 #define MACROBLOCK_PATTERN 2
@ -298,3 +301,5 @@ extern mpeg2_mc_t mpeg2_mc_3dnow;
extern mpeg2_mc_t mpeg2_mc_altivec; extern mpeg2_mc_t mpeg2_mc_altivec;
extern mpeg2_mc_t mpeg2_mc_alpha; extern mpeg2_mc_t mpeg2_mc_alpha;
extern mpeg2_mc_t mpeg2_mc_vis; extern mpeg2_mc_t mpeg2_mc_vis;
#endif /* MPEG2_INTERNAL_H */

@ -21,6 +21,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef TENDRA_H
#define TENDRA_H
#pragma TenDRA begin #pragma TenDRA begin
#pragma TenDRA longlong type warning #pragma TenDRA longlong type warning
@ -33,3 +36,5 @@
int TenDRA; int TenDRA;
#endif /* TenDRA_check */ #endif /* TenDRA_check */
#endif /* TENDRA_H */

@ -21,6 +21,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * 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_sequence_s;
struct mpeg2_convert_init_s; struct mpeg2_convert_init_s;
typedef struct { typedef struct {
@ -56,3 +59,5 @@ void vo_accel (uint32_t accel);
/* return NULL terminated array of all drivers */ /* return NULL terminated array of all drivers */
vo_driver_t const * vo_drivers (void); vo_driver_t const * vo_drivers (void);
#endif /* VIDEO_OUT_H */

@ -41,6 +41,9 @@
* the assembler to keep the binary from becoming tainted. * 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_opc_base ((0x1 << 31) | (0x36 << 19))
#define vis_opf(X) ((X) << 5) #define vis_opf(X) ((X) << 5)
#define vis_sreg(X) (X) #define vis_sreg(X) (X)
@ -326,3 +329,5 @@ static inline void vis_alignaddrl_g0(void *_ptr)
/* Pixel component distance. */ /* Pixel component distance. */
#define vis_pdist(rs1,rs2,rd) vis_dd2d(0x3e, rs1, rs2, rd) #define vis_pdist(rs1,rs2,rd) vis_dd2d(0x3e, rs1, rs2, rd)
#endif /* VIS_H */

@ -21,6 +21,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * 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) \ #define GETWORD(bit_buf,shift,bit_ptr) \
do { \ do { \
bit_buf |= ((bit_ptr[0] << 8) | bit_ptr[1]) << (shift); \ bit_buf |= ((bit_ptr[0] << 8) | bit_ptr[1]) << (shift); \
@ -427,3 +430,5 @@ static const MBAtab MBA_11 [] = {
{ 7, 7}, { 7, 7}, { 7, 7}, { 7, 7}, { 7, 7}, { 7, 7}, { 7, 7}, { 7, 7},
{ 7, 7}, { 7, 7}, { 7, 7}, { 7, 7} { 7, 7}, { 7, 7}, { 7, 7}, { 7, 7}
}; };
#endif /* VLC_H */

@ -589,3 +589,5 @@ void k9DVDAuthor::setburnDVD( const bool& _newVal) {
bool k9DVDAuthor::getError() { bool k9DVDAuthor::getError() {
return error; return error;
} }
#include "k9dvdauthor.moc"

@ -67,3 +67,5 @@ void k9DVDChapter::setSelected(bool _value)
m_selected = _value; m_selected = _value;
} }
#include "k9dvdchapter.moc"

@ -60,3 +60,5 @@ void k9DVDProgress::closeEvent( TQCloseEvent* ce )
ce->ignore(); ce->ignore();
return; return;
} }
#include "k9dvdprogress.moc"

@ -40,4 +40,4 @@ k9DVDSize::~k9DVDSize()
{ {
} }
#include "k9dvdsize.moc"

@ -498,6 +498,4 @@ void k9DVDTitle::selectChapters(bool _state) {
} }
} }
#include "k9dvdtitle.moc"

@ -136,3 +136,4 @@ int k9DVDTitleset::getNewAudioStreamId(int _oldId) {
return newId; return newId;
} }
#include "k9dvdtitleset.moc"

@ -931,3 +931,5 @@ void k9Ifo2::navRead_PCI(pci_t *pci, uchar *buffer) {
} }
} }
#include "k9ifo2.moc"

@ -23,7 +23,7 @@ KDE_ICON = k9copy
bin_PROGRAMS = k9copy bin_PROGRAMS = k9copy
# the application source, library search path, and link libraries # 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 \
k9langselect.cpp k9main.cpp k9mainw.ui k9mencodercmdgen.cpp k9mp4title.cpp k9play.cpp \ k9langselect.cpp k9main.cpp k9mainw.ui k9mencodercmdgen.cpp k9mp4title.cpp k9play.cpp \
k9playbackoptions.cpp k9prefauthor.cpp k9prefdvd.cpp k9prefmencoder.cpp k9prefmpeg4.cpp \ k9playbackoptions.cpp k9prefauthor.cpp k9prefdvd.cpp k9prefmencoder.cpp k9prefmpeg4.cpp \
k9prefpreview.cpp k9redirect.cpp k9settings.cpp k9titlefactor.cpp k9updatefactor.cpp \ k9prefpreview.cpp k9redirect.cpp k9settings.cpp k9titlefactor.cpp k9updatefactor.cpp \

@ -527,3 +527,4 @@ void k9Copy::setEnabledCreateDVD(bool _state) {
m_actions["create"]->setEnabled(_state); m_actions["create"]->setEnabled(_state);
} }
#include "k9copy.moc"

@ -19,6 +19,12 @@
#include <cstdlib> #include <cstdlib>
#include "ac.h" #include "ac.h"
#include <X11/Xlib.h> #include <X11/Xlib.h>
#if defined(Above)
#undef Above // defined in X.h, causes conflict with enum in tqslider.h
#endif
#if defined(Below)
#undef Below // defined in X.h, causes conflict with enum in tqslider.h
#endif
k9GLWidget::k9GLWidget(TQWidget *parent, const char *name):TQGLWidget(parent, name) { k9GLWidget::k9GLWidget(TQWidget *parent, const char *name):TQGLWidget(parent, name) {
XMapRaised(x11Display(),winId()); XMapRaised(x11Display(),winId());

@ -227,3 +227,5 @@ void kViewMPEG2::closeEvent( TQCloseEvent* ce ) {
void kViewMPEG2::sliderPressed() { void kViewMPEG2::sliderPressed() {
lockSlider=true; lockSlider=true;
} }
#include "kviewmpeg2.moc"

Loading…
Cancel
Save