Posts by marco

--- ffmpeg_2.9.patch    2016-06-28 11:10:02.067298290 +0200
+++ /home/martin/rpmbuild/SOURCES/ffmpeg_2.9.patch      2016-06-28 11:06:47.831831054 +0200
@@ -207,15 +207,6 @@
        decoder->VideoCtx->draw_horiz_band = NULL;
 --- a/video.c
 +++ b/video.c
-@@ -17,7 +17,7 @@
- ///   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- ///   GNU Affero General Public License for more details.
- ///
--///   $Id: d9534b488d56e3efa4d92a0af07e715a05766e2e $
-+///   $Id: bdc472fb7b44d8f56e8d71ad42b71a64a08eef83 $
- //////////////////////////////////////////////////////////////////////////////
- 
- ///
 @@ -259,8 +259,8 @@
      void (*const DelHwDecoder) (VideoHwDecoder *);
      unsigned (*const GetSurface) (VideoHwDecoder *, const AVCodecContext *);
@@ -578,15 +569,6 @@
      int ms_delay;
 --- a/video.h
 +++ b/video.h
-@@ -17,7 +17,7 @@
- ///   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- ///   GNU Affero General Public License for more details.
- ///
--///   $Id: 7b676db0db3e7773e753356b9a94a1a369ce20bb $
-+///   $Id: 5d397e1e0aa57766574cbfa38d64a72dbebdbaf6 $
- //////////////////////////////////////////////////////////////////////////////
- 
- /// @addtogroup Video
 @@ -59,9 +59,9 @@
      /// Release a video hardware surface
  extern void VideoReleaseSurface(VideoHwDecoder *, unsigned);

gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -m64 -mtune=generic -fPIC -Wno-deprecated-declarations -I/usr/include/alsa    -I/usr/include/libdrm  -I/usr/include/ffmpeg -I/usr/include/libdrm -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/ffmpeg -DPLUGIN_NAME_I18N='"softhddevice"' -D_GNU_SOURCE  -DAV_INFO -DAV_INFO_TIME=3000	 -DUSE_PIP			 -DUSE_MPEG_COMPLETE		 -DH264_EOS_TRICKSPEED		 -DUSE_VDR_SPU			 -DUSE_ALSA -DUSE_OSS -DUSE_VDPAU -DUSE_VAAPI -DUSE_GLX -DUSE_SCREENSAVER -DUSE_SWRESAMPLE -DUSE_OPENGLOSD   -g -W -Wall -Wextra -Winit-self -Wdeclaration-after-statement   -c -o audio.o audio.c
video.c:447:1: warning: data definition has no type or storage class
 max_mutex_delay = 1;
 ^~~~~~~~~~~~~~~
video.c:447:1: warning: type defaults to 'int' in declaration of 'max_mutex_delay' [-Wimplicit-int]
video.c:1566:22: error: field 'PixFmt' has incomplete type
     enum PixelFormat PixFmt;  ///< ffmpeg frame pixfmt
                      ^~~~~~
video.c: In function 'VaapiNewHwDecoder':
video.c:2070:23: error: 'PIX_FMT_NONE' undeclared (first use in this function)
     decoder->PixFmt = PIX_FMT_NONE;
                       ^~~~~~~~~~~~
video.c:2070:23: note: each undeclared identifier is reported only once for each function it appears in
video.c: At top level:
video.c:2560:22: error: parameter 2 ('pix_fmt') has incomplete type
     enum PixelFormat pix_fmt, VAImageFormat * format)
                      ^~~~~~~
video.c: In function 'VaapiFindImageFormat':
video.c:2571:7: error: 'PIX_FMT_YUV420P' undeclared (first use in this function)
  case PIX_FMT_YUV420P:
       ^~~~~~~~~~~~~~~
video.c:2572:7: error: 'PIX_FMT_YUVJ420P' undeclared (first use in this function)
  case PIX_FMT_YUVJ420P:
       ^~~~~~~~~~~~~~~~
video.c:2576:7: error: 'PIX_FMT_NV12' undeclared (first use in this function)
  case PIX_FMT_NV12:
       ^~~~~~~~~~~~
video.c:2560:22: warning: unused parameter 'pix_fmt' [-Wunused-parameter]
     enum PixelFormat pix_fmt, VAImageFormat * format)

diff --git a/contrib/epgd.service b/contrib/epgd.service
index 4e22b3b..cf05a38 100644
--- a/contrib/epgd.service
+++ b/contrib/epgd.service
@ -4,7 +4,7 @ After=mariadb.service


[Service]
 Type=forking
-ExecStart=/usr/bin/epgd -c /etc/epgd
+ExecStart=/usr/sbin/epgd -c /etc/epgd


[Install]
 WantedBy=multi-user.target
diff --git a/contrib/epghttpd.service b/contrib/epghttpd.service
index 6400757..61e667d 100644
--- a/contrib/epghttpd.service
+++ b/contrib/epghttpd.service
@ -4,7 +4,7 @ After=epgd.service


[Service]
 Type=forking
-ExecStart=/usr/bin/epghttpd -c /etc/epgd
+ExecStart=/usr/sbin/epghttpd -c /etc/epgd


[Install]
 WantedBy=multi-user.target

g++ -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -m64 -mtune=generic -fPIC -c -DLIBAPIVERSION=0 -DLIBVERSION="0.1.0"  -o pluginstructure.o pluginstructure.c
In file included from coreengine/area.h:10:0,
                 from coreengine/viewelement.h:12,
                 from coreengine/viewelementplugin.h:4,
                 from coreengine/view.h:13,
                 from coreengine/viewdisplaychannel.h:4,
                 from designer.h:7,
                 from config.h:10,
                 from skindesigner.c:12:
coreengine/definitions.h:66:30: error: could not convert 'count' from 'eVeDisplayMenu' to 'int'
     timers = eVeDisplayMenu::count,
                              ^~~~~
coreengine/definitions.h:81:36: error: could not convert 'count' from 'eVeDisplayMenu' to 'int'
     detailheader = eVeDisplayMenu::count,
                                    ^~~~~
coreengine/definitions.h:510:40: error: could not convert 'count' from 'eScraperPosterBannerIT' to 'int'
     islivetv = eScraperPosterBannerIT::count,
                                        ^~~~~
coreengine/definitions.h:520:37: error: could not convert 'count' from 'eScraperPosterBannerST' to 'int'
     title = eScraperPosterBannerST::count,
                                     ^~~~~
coreengine/definitions.h:1041:31: error: could not convert 'count' from 'eScraperHeaderST' to 'int'
     title = eScraperHeaderST::count,
                               ^~~~~
coreengine/definitions.h:1056:36: error: could not convert 'count' from 'eScraperHeaderIT' to 'int'
     daynumeric = eScraperHeaderIT::count,
                                    ^~~~~
coreengine/definitions.h:1070:30: error: could not convert 'count' from 'eScraperHeaderST' to 'int'
     name = eScraperHeaderST::count,
                              ^~~~~
coreengine/definitions.h:1084:36: error: could not convert 'count' from 'eScraperHeaderIT' to 'int'
     daynumeric = eScraperHeaderIT::count,
                                    ^~~~~
coreengine/definitions.h:1209:25: error: could not convert 'count' from 'eScraperST' to 'int'
     title = eScraperST::count,
                         ^~~~~
coreengine/definitions.h:1227:30: error: could not convert 'count' from 'eScraperIT' to 'int'
     daynumeric = eScraperIT::count,
                              ^~~~~
coreengine/definitions.h:1258:24: error: could not convert 'count' from 'eScraperST' to 'int'
     name = eScraperST::count,
                        ^~~~~
coreengine/definitions.h:1283:30: error: could not convert 'count' from 'eScraperIT' to 'int'
     daynumeric = eScraperIT::count,
                              ^~~~~
coreengine/definitions.h:1427:24: error: could not convert 'count' from 'eScraperST' to 'int'
     name = eScraperST::count,
                        ^~~~~
coreengine/definitions.h:1438:30: error: could not convert 'count' from 'eScraperIT' to 'int'
     daynumeric = eScraperIT::count,
                              ^~~~~

--- vdr-plugin-skindesigner-0.8.0/Makefile.orig 2016-01-31 16:06:51.818937173 +0100
+++ vdr-plugin-skindesigner-0.8.0/Makefile      2016-01-31 16:07:15.881947561 +0100
@@ -46,6 +46,7 @@
 DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' $(CONFIG)
 DEFINES += $(shell xml2-config --cflags)
 DEFINES += -DSCRIPTFOLDER='"$(SKINDESIGNER_SCRIPTDIR)"'
+DEFINES += -D__STL_CONFIG_H


 INCLUDES += $(shell pkg-config --cflags freetype2 fontconfig)
 INCLUDES += $(shell pkg-config --cflags librsvg-2.0 cairo-png) -ljpeg

coreengine/../services/epgsearch.h:164:12: warning: 'template<class> class std::auto_ptr' is deprecated [-Wdeprecated-declarations]
       std::auto_ptr<cServiceHandler> handler;
            ^
In file included from /usr/include/c++/5.3.1/memory:81:0,
                 from coreengine/../services/epgsearch.h:33,
                 from coreengine/viewdetail.h:4,
                 from coreengine/viewdisplaymenu.h:5,
                 from designer.h:8,
                 from config.h:10,
                 from setup.h:4,
                 from setup.c:4:
/usr/include/c++/5.3.1/bits/unique_ptr.h:49:28: note: declared here
   template<typename> class auto_ptr;
                            ^

--- Makefile.orig       2016-01-14 18:15:08.422692294 +0100
+++ Makefile    2016-01-14 18:34:39.836180446 +0100
@@ -59,10 +59,10 @@
 hlib:
        (cd lib && $(MAKE) lib)


-$(TARGET) : $(HLIBDEP) $(OBJS)
-       $(CC) $(CFLAGS) -rdynamic $(OBJS) $(DLIBS) -o $@
+$(TARGET) : hlib $(OBJS)
+       $(CC) $(CFLAGS) -rdynamic $(OBJS) $(HLIB) $(DLIBS) -o $@


-$(HTTPTARGET) : $(HLIBDEP) $(HTTPOBJS)
+$(HTTPTARGET) : hlib $(HTTPOBJS)
        $(CC) $(CFLAGS) -rdynamic $(HTTPOBJS) $(HTTPLIBS) -o $@


 lv:

// Converts an argument passed to wxPrint etc. into standard form expected,
// by wxXXX functions, e.g. all strings (wxString, char*, wchar_t*) are
// converted into wchar_t* or char* depending on the build.
template<typename T>
struct wxArgNormalizer
{
    // Ctor. 'value' is the value passed as variadic argument, 'fmt' is pointer
    // to printf-like format string or NULL if the variadic function doesn't
    // use format string and 'index' is index of 'value' in variadic arguments
    // list (starting at 1)
    wxArgNormalizer(T value,
                    const wxFormatString *fmt, unsigned index)
        : m_value(value)
    {
        wxASSERT_ARG_TYPE( fmt, index, wxFormatStringSpecifier<T>::value );
    }


    // Returns the value in a form that can be safely passed to real vararg
    // functions. In case of strings, this is char* in ANSI build and wchar_t*
    // in Unicode build.
    T get() const { return m_value; }


    T m_value;
};