Compilation fixes for jessie

diff --git a/GNUmakefile b/GNUmakefile
index 54f295ca10070b171bd7b947bc7eb5d024edb50d..bc0dd626efe4efd8780f94a8c8bcf12299e030f8 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -90,13 +90,13 @@ endif
 ifeq ($(vomp_platform),raspberry)
 $(info Raspberry pi flags)
 LDFLAGS = -Wall $(PICTURES)
-LIBS = -L/opt/vc/lib -lpthread -lrt -lEGL -lOpenVG -lopenmaxil -lbcm_host   -lavformat -lavcodec -lavutil -lavresample
+LIBS = -L/opt/vc/lib  -lpthread -lrt -lEGL -lOpenVG -lopenmaxil -lbcm_host   -lavformat -lavcodec -lavutil -lavresample
 
 OBJECTS += main.o threadp.o  osdvector.o surfacevector.o osdopenvg.o ledraspberry.o mtdraspberry.o videoomx.o audioomx.o imageomx.o wjpegsimple.o remotelinux.o signal.o 
-LIBS+= -ldl -lfontconfig -lfreetype -lMagick++ 
+LIBS+= -ldl -lfontconfig -lfreetype -L/usr/lib/arm-linux-gnueabihf -lMagick++-6.Q16 
 CROSSLIBS = 
-INCLUDES = -DVOMP_PLATTFORM_RASPBERRY   -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads  -I/usr/include/freetype2 -I/usr/include/ImageMagick
-CXXFLAGS_DEV += -D__STDC_CONSTANT_MACROS
+INCLUDES = -DVOMP_PLATTFORM_RASPBERRY   -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads  -I/usr/include/freetype2 -I/usr/include/ImageMagick -I/usr/include/ImageMagick-6 -I/usr/include/arm-linux-gnueabihf/ImageMagick-6
+CXXFLAGS_DEV += -D__STDC_CONSTANT_MACROS 
 CXXFLAGS_REL += -D__STDC_CONSTANT_MACROS
 endif
 
@@ -107,9 +107,9 @@ LDFLAGS = -Wall $(PICTURES) -Wl,--verbose -Xlinker --rpath-link=rpi-root/usr/lib
 LIBS = -Lrpi-root/opt/vc/lib -Lrpi-root/lib -Lrpi-root/usr/lib -Lrpi-root/lib/arm-linux-gnueabihf -Lrpi-root/usr/lib/arm-linux-gnueabihf -Lrpi-root/usr/local/lib -lpthread -lrt -lEGL -lOpenVG -lopenmaxil -lbcm_host -lavformat -lavcodec -lavutil -lavresample -ldl -lfontconfig
 
 OBJECTS += main.o threadp.o osdvector.o surfacevector.o osdopenvg.o ledraspberry.o mtdraspberry.o videoomx.o audioomx.o imageomx.o wjpegsimple.o remotelinux.o signal.o 
-LIBS+=  -lfreetype -lMagick++ 
+LIBS+=  -lfreetype -lMagick++-6.Q16 
 CROSSLIBS =
-INCLUDES = -DVOMP_PLATTFORM_RASPBERRY   -Irpi-root/opt/vc/include -Irpi-root/opt/vc/include/interface/vcos/pthreads -Irpi-root/usr/include -Irpi-root/usr/include/freetype2 -Irpi-root/usr/include/ImageMagick
+INCLUDES = -DVOMP_PLATTFORM_RASPBERRY   -Irpi-root/opt/vc/include -Irpi-root/opt/vc/include/interface/vcos/pthreads -Irpi-root/usr/include -Irpi-root/usr/include/freetype2 -Irpi-root/usr/include/ImageMagick-6  -Irpi-root/usr/include/ImageMagick  -Irpi-root/usr/include/arm-linux-gnueabihf/ImageMagick-6  
 CXXFLAGS_DEV += -D__STDC_CONSTANT_MACROS -mfloat-abi=hard
 CXXFLAGS_REL += -D__STDC_CONSTANT_MACROS -mfloat-abi=hard
 endif

diff --git a/audioomx.cc b/audioomx.cc
index f6ae46f59df38ceae46f1ae693fa510a081b5dea..0199fb34c8f590cc259096f1427b9274f8b0e627 100644 (file)
--- a/audioomx.cc
+++ b/audioomx.cc
@@ -102,21 +102,21 @@ int AudioOMX::init(UCHAR tstreamType) {
        av_register_all();
        av_log_set_flags(AV_LOG_SKIP_REPEATED);
 
-       ac3codec_libav = avcodec_find_decoder(CODEC_ID_AC3);
+       ac3codec_libav = avcodec_find_decoder(AV_CODEC_ID_AC3);
        if (ac3codec_libav == NULL) {
                Log::getInstance()->log("Audio", Log::DEBUG,
                                "Find libav ac3 decoder failed");
                return 0;
        }
 
-       mp23codec_libav = avcodec_find_decoder(CODEC_ID_MP3);
+       mp23codec_libav = avcodec_find_decoder(AV_CODEC_ID_MP3);
        if (mp23codec_libav == NULL) {
                Log::getInstance()->log("Audio", Log::DEBUG,
                                "Find libav mpeg audio decoder failed");
                return 0;
        }
 
-       aaclatmcodec_libav = avcodec_find_decoder(CODEC_ID_AAC_LATM);
+       aaclatmcodec_libav = avcodec_find_decoder(AV_CODEC_ID_AAC_LATM);
        if (aaclatmcodec_libav == NULL) {
                Log::getInstance()->log("Audio", Log::DEBUG,
                                "Find libav aac latm decoder failed");

diff --git a/debian/control b/debian/control
index fbbb69c74c86e18cf0212e643762befd25bc2436..da4d10bce43f3c4794704db9f9ae974179619730 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: vompclient
 Section: unknown
 Priority: extra
 Maintainer: Marten Richter <marten.richter@freenet.de>
-Build-Depends: debhelper (>= 8.0.0), libcec-dev (>= 1.8.1), libraspberrypi-dev, libfreetype6-dev, libmagick++-dev, libavformat-dev, libavutil-dev, libavcodec-dev, libavresample-dev
+Build-Depends: debhelper (>= 8.0.0), libcec-dev (>= 1.8.1), libraspberrypi-dev, libfreetype6-dev, libmagick++-dev,  libavformat-dev, libavutil-dev, libavcodec-dev, libavresample-dev
 Standards-Version: 3.9.3
 Homepage: www.loggytronic.com/vomp.php
 Vcs-Git: http://git.vomp.tv/vompclient-raspi.git

diff --git a/remotelinux.cc b/remotelinux.cc
index 2929dee989d733dc1ae40d0d9597d2a870779834..8f693b99fa8a60fd22de29ea35e3f7faa2a4dde6 100644 (file)
--- a/remotelinux.cc
+++ b/remotelinux.cc
@@ -905,19 +905,19 @@ void RemoteLinux::changePowerState(bool poweron){
 }
 
 
-int RemoteLinux::cecLogMessage(void *param, const cec_log_message &message)
+int RemoteLinux::cecLogMessage(void *param, const cec_log_message message)
 {
        Log::getInstance()->log("Remote", Log::DEBUG, "CECLOG: %lld %d %s",message.time , message.level, message.message );
        return 0;
 }
 
-int RemoteLinux::cecKeyPress(void*param, const cec_keypress &key)
+int RemoteLinux::cecKeyPress(void*param, const cec_keypress key)
 {
        //Log::getInstance()->log("Remote", Log::DEBUG, "Incoming cec key %d %d", key.keycode,key.duration);
        if (key.duration==0) ((RemoteLinux*)Remote::getInstance())->incomingCECkey(key.keycode);
        return 1;
 }
-int RemoteLinux::cecCommand(void *param, const cec_command &command)
+int RemoteLinux::cecCommand(void *param, const cec_command command)
 {
        Log::getInstance()->log("Remote", Log::DEBUG, "CECCommand: %d",command.opcode);
        switch (command.opcode) {
@@ -951,7 +951,7 @@ int RemoteLinux::cecCommand(void *param, const cec_command &command)
        return 1;
 }
 
-int RemoteLinux::cecConfigurationChanged(void *param, const libcec_configuration &config)
+int RemoteLinux::cecConfigurationChanged(void *param, const libcec_configuration config)
 {
        Log::getInstance()->log("Remote", Log::DEBUG, "CECConfig:"/*,config.string()*/);
        return 1;

diff --git a/remotelinux.h b/remotelinux.h
index bce876008fc19319d8e681babea6ee868a9ff0ab..5e996ae6e8281e36012e53717cd6086f9b541f6d 100644 (file)
--- a/remotelinux.h
+++ b/remotelinux.h
@@ -92,10 +92,10 @@ class RemoteLinux : public Remote
     void incomingCECkey(int keys);
     void incomingPowerkey(UCHAR key);
 
-       static int cecLogMessage(void *param, const CEC::cec_log_message &message);
-       static int cecKeyPress(void*param, const CEC::cec_keypress &key);
-       static int cecCommand(void *param, const CEC::cec_command &command);
-       static int cecConfigurationChanged(void *param, const CEC::libcec_configuration &config);
+       static int cecLogMessage(void *param, const CEC::cec_log_message message);
+       static int cecKeyPress(void*param, const CEC::cec_keypress key);
+       static int cecCommand(void *param, const CEC::cec_command command);
+       static int cecConfigurationChanged(void *param, const CEC::libcec_configuration config);
        static void cecSourceActivated(void*param, const CEC::cec_logical_address address, const uint8_t activated);
 
 };