Merge branch 'master' of code.vuplus.com:/opt/repository/openvuplus_3.0

diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-transtreamproxy.bb b/meta-openvuplus/recipes-vuplus/enigma2/enigma2-transtreamproxy.bb
index 2728e20..a9e1929 100644 (file)
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-transtreamproxy.bb
+++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2-transtreamproxy.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 inherit gitpkgv
 
-PR = "r10"
+PR = "r11"
 
 PV = "0.1+git${SRCPV}"
 PKGV = "0.1+git${GITPKGV}"
@@ -14,7 +14,6 @@ SRCREV_pn-${PN} ?= "${AUTOREV}"
 DEPENDS += "boost"
 SRC_URI = "\
        git://code.vuplus.com/git/filestreamproxy.git;protocol=git;branch=transtreamproxy \
-       file://ext-pid-patch.diff;striplevel=1 \
        "
 inherit autotools-brokensep
 

diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-transtreamproxy/ext-pid-patch.diff b/meta-openvuplus/recipes-vuplus/enigma2/enigma2-transtreamproxy/ext-pid-patch.diff
deleted file mode 100644 (file)
index 5480ab6..0000000
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2-transtreamproxy/ext-pid-patch.diff
+++ /dev/null
@@ -1,55 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index dfe149a..4a9f975 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -32,6 +32,18 @@ AC_SUBST(PLATFORM)
- AC_SUBST(INCPATH)
- 
- # Checks for typedefs, structures, and compiler characteristics.
-+AC_SUBST(USE_EXT_PID)
-+
-+AC_ARG_ENABLE([ext-pid],
-+  [AS_HELP_STRING([--enable-ext-pid],
-+  [enable extend pid (default is no)])],
-+  [use_ext_pid=$enableval],
-+  [use_ext_pid=no])
-+
-+if test "$use_ext_pid" = "yes"; then
-+      AC_DEFINE([HAVE_EXT_PID], [1], [Define to 1 if support extend pid.])
-+      USE_EXT_PID=1
-+fi
- 
- # Checks for library functions.
- 
-diff --git a/src/Encoder.h b/src/Encoder.h
-index 5831482..1075b90 100644
---- a/src/Encoder.h
-+++ b/src/Encoder.h
-@@ -8,6 +8,8 @@
- #ifndef ENCODER_H_
- #define ENCODER_H_
- 
-+#include "config.h"
-+
- #include <string>
- 
- #include "3rdparty/trap.h"
-@@ -30,9 +32,16 @@ private:
- 
- public:
-       enum {
--              IOCTL_SET_VPID   = 1,
--              IOCTL_SET_APID   = 2,
-+#ifdef HAVE_EXT_PID
-+              IOCTL_SET_VPID   = 11,
-+              IOCTL_SET_APID   = 12,
-+              IOCTL_SET_PMTPID = 13,
-+#else
-+              IOCTL_SET_VPID   = 1,
-+              IOCTL_SET_APID   = 2,
-               IOCTL_SET_PMTPID = 3,
-+#endif
-+
-               IOCTL_START_TRANSCODING = 100,
-               IOCTL_STOP_TRANSCODING  = 200
-       };