Merge pull request #2460 from HiassofT/le9-v4l-utils-dvb

include dvb utils from v4l-utils in image, add v4l2-ctl

packages/addons/addon-depends/dvb-tools-depends/dvb-fe-tool/package.mk

@@ -1,66 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="dvb-fe-tool"
-PKG_VERSION="326060c"
-PKG_SHA256="00b6795dd9c8a400e65451883002355c32c854bc22a01647ec9d161819d82c1c"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://linuxtv.org/"
-PKG_URL="https://git.linuxtv.org/cgit.cgi/v4l-utils.git/snapshot/$PKG_VERSION.tar.xz"
-PKG_SOURCE_DIR="$PKG_VERSION*"
-PKG_DEPENDS_TARGET="toolchain systemd"
-PKG_SECTION="tools"
-PKG_SHORTDESC="dvb-fe-tool: Linux V4L2 and DVB API utilities and v4l libraries (libv4l)."
-PKG_LONGDESC="Linux V4L2 and DVB API utilities and v4l libraries (libv4l)."
-PKG_TOOLCHAIN="autotools"
-
-PKG_CONFIGURE_OPTS_TARGET="--disable-nls \
-            --disable-rpath \
-            --disable-libdvbv5 \
-            --disable-libv4l \
-            --disable-v4l-utils \
-            --disable-qv4l2 \
-            --without-jpeg \
-            --without-libiconv-prefix \
-            --without-libintl-prefix"
-
-post_patch() {
-  mkdir -p $PKG_BUILD/build-aux/
-    touch $PKG_BUILD/build-aux/config.rpath
-    touch $PKG_BUILD/libdvbv5-po/Makefile.in.in
-    touch $PKG_BUILD/v4l-utils-po/Makefile.in.in
-}
-
-pre_configure_target() {
-  export LDFLAGS="$LDFLAGS -pthread"
-}
-
-make_target() {
-  cd $PKG_BUILD/.$TARGET_NAME/lib/libdvbv5
-  make CFLAGS="$TARGET_CFLAGS"
-
-  cd $PKG_BUILD/.$TARGET_NAME/utils/dvb
-  make CFLAGS="$TARGET_CFLAGS"
-}
-
-makeinstall_target() {
-  : # nop
-}

packages/addons/tools/dvb-tools/changelog.txt

@@ -1,3 +1,5 @@
+104
+- remove dvb-fe-tool, it's already included in the image
 103
 - added blindscan-s2
 - added dvbsnoop

packages/addons/tools/dvb-tools/package.mk

@@ -18,7 +18,7 @@
 
 PKG_NAME="dvb-tools"
 PKG_VERSION=""
-PKG_REV="103"
+PKG_REV="104"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE=""
@@ -26,7 +26,7 @@ PKG_URL=""
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="virtual"
 PKG_SHORTDESC="DVB-Tools: is a bundle of dvb tools and programs"
-PKG_LONGDESC="This bundle currently includes blindscan-s2, dvb-apps, dvb-fe-tool, dvblast, dvbsnoop, mumudvb, szap-s2, tune-s2 and w_scan."
+PKG_LONGDESC="This bundle currently includes blindscan-s2, dvb-apps, dvblast, dvbsnoop, mumudvb, szap-s2, tune-s2 and w_scan."
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="DVB Tools"
@@ -35,7 +35,6 @@ PKG_ADDON_TYPE="xbmc.python.script"
 PKG_DEPENDS_TARGET="toolchain \
                     blindscan-s2 \
                     dvb-apps \
-                    dvb-fe-tool \
                     dvblast \
                     dvbsnoop \
                     mumudvb \
@@ -62,9 +61,6 @@ addon() {
     cp -P $(get_build_dir dvb-apps)/util/szap/tzap $ADDON_BUILD/$PKG_ADDON_ID/bin
     cp -P $(get_build_dir dvb-apps)/util/zap/zap $ADDON_BUILD/$PKG_ADDON_ID/bin
 
-    # dvb-de-tool
-    cp -P $(get_build_dir dvb-fe-tool)/.$TARGET_NAME/utils/dvb/dvb-fe-tool $ADDON_BUILD/$PKG_ADDON_ID/bin
-
     # dvblast
     cp -P $(get_build_dir dvblast)/dvblast $ADDON_BUILD/$PKG_ADDON_ID/bin
 

packages/sysutils/v4l-utils/package.mk

@@ -30,7 +30,9 @@ PKG_SECTION="system"
 PKG_SHORTDESC="v4l-utils: Linux V4L2 and DVB API utilities and v4l libraries (libv4l)."
 PKG_LONGDESC="Linux V4L2 and DVB API utilities and v4l libraries (libv4l)."
 
-PKG_CONFIGURE_OPTS_TARGET="--without-jpeg"
+PKG_CONFIGURE_OPTS_TARGET="--without-jpeg \
+	--enable-static \
+	--disable-shared"
 
 pre_configure_target() {
   # cec-ctl fails to build in subdirs
@@ -44,6 +46,9 @@ make_target() {
   if [ "$CEC_FRAMEWORK_SUPPORT" = "yes" ]; then
     make -C utils/cec-ctl CFLAGS="$TARGET_CFLAGS"
   fi
+  make -C lib CFLAGS="$TARGET_CFLAGS"
+  make -C utils/dvb CFLAGS="$TARGET_CFLAGS"
+  make -C utils/v4l2-ctl CFLAGS="$TARGET_CFLAGS"
 }
 
 makeinstall_target() {
@@ -52,6 +57,8 @@ makeinstall_target() {
   if [ "$CEC_FRAMEWORK_SUPPORT" = "yes" ]; then
     make install DESTDIR=$INSTALL PREFIX=/usr -C utils/cec-ctl
   fi
+  make install DESTDIR=$INSTALL PREFIX=/usr -C utils/dvb
+  make install DESTDIR=$INSTALL PREFIX=/usr -C utils/v4l2-ctl
 }
 
 create_multi_keymap() {