Skip to contentSkip to conversation

package/libdvbcsa: New package

PATCH Superseded Bernd Kuhls 2 participants 9 messages Oct 13, 2014 – Oct 14, 2014

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/7 package/libdvbcsa: New package

---
 package/Config.in                |    1 +
 package/libdvbcsa/Config.in      |    9 +++++++++
 package/libdvbcsa/libdvbcsa.hash |    6 ++++++
 package/libdvbcsa/libdvbcsa.mk   |   31 +++++++++++++++++++++++++++++++
 4 files changed, 47 insertions(+)
 create mode 100644 package/libdvbcsa/Config.in
 create mode 100644 package/libdvbcsa/libdvbcsa.hash
 create mode 100644 package/libdvbcsa/libdvbcsa.mk
package/Config.in +1 -0
index 186ffea..da059d8 100644
@@ -745,6 +745,7 @@ endmenu
 menu "Multimedia"
 	source "package/libass/Config.in"
 	source "package/libbluray/Config.in"
+	source "package/libdvbcsa/Config.in"
 	source "package/libdvbsi/Config.in"
 	source "package/libdvdnav/Config.in"
 	source "package/libdvdread/Config.in"
package/libdvbcsa/Config.in new file +9 -0
new file mode 100644
index 0000000..dd7dc15
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_LIBDVBCSA
+	bool "libdvbcsa"
+	help
+	  libdvbcsa is a free implementation of the DVB Common Scrambling
+	  Algorithm - DVB/CSA - with encryption and decryption capabilities
+
+	  As libdvbcsa implements a standard, it is completely legal to use it.
+
+	  http://www.videolan.org/developers/libdvbcsa.html
package/libdvbcsa/libdvbcsa.hash new file +6 -0
new file mode 100644
index 0000000..5b3fa4c
@@ -0,0 +1,6 @@
+# From http://download.videolan.org/pub/videolan/libdvbcsa/1.1.0/libdvbcsa-1.1.0.tar.gz.sha256
+sha256	4db78af5cdb2641dfb1136fe3531960a477c9e3e3b6ba19a2754d046af3f456d	libdvbcsa-1.1.0.tar.gz
+# From http://download.videolan.org/pub/videolan/libdvbcsa/1.1.0/libdvbcsa-1.1.0.tar.gz.sha1
+sha1	5f4640a7e93ae6494f24a881414e5c343f803365				libdvbcsa-1.1.0.tar.gz
+# From http://download.videolan.org/pub/videolan/libdvbcsa/1.1.0/libdvbcsa-1.1.0.tar.gz.md5
+md5	478ab1ca56ca58d2667da6ce22f74e39					libdvbcsa-1.1.0.tar.gz
package/libdvbcsa/libdvbcsa.mk new file +31 -0
new file mode 100644
index 0000000..ef1d957
@@ -0,0 +1,31 @@
+################################################################################
+#
+# libdvbcsa
+#
+################################################################################
+
+LIBDVBCSA_VERSION = 1.1.0
+LIBDVBCSA_SITE = http://download.videolan.org/pub/videolan/libdvbcsa/$(LIBDVBCSA_VERSION)
+LIBDVBCSA_LICENSE = GPLv2+
+LIBDVBCSA_LICENSE_FILES = COPYING
+LIBDVBCSA_INSTALL_STAGING = YES
+
+ifeq ($(BR2_X86_CPU_HAS_MMX),y)
+LIBDVBCSA_CONF_OPTS += --enable-mmx
+else
+LIBDVBCSA_CONF_OPTS += --disable-mmx
+endif
+
+ifeq ($(BR2_X86_CPU_HAS_SSE2),y)
+LIBDVBCSA_CONF_OPTS += --enable-sse2
+else
+LIBDVBCSA_CONF_OPTS += --disable-sse2
+endif
+
+ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y)
+LIBDVBCSA_CONF_OPTS += --enable-altivec
+else
+LIBDVBCSA_CONF_OPTS += --disable-altivec
+endif
+
+$(eval $(autotools-package))
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH v2 2/7 package/ffmpeg: Enable support for libavresample

---
 package/ffmpeg/Config.in |    5 +++++
 package/ffmpeg/ffmpeg.mk |    6 ++++++
 2 files changed, 11 insertions(+)
package/ffmpeg/Config.in +5 -0
index 20d5231..6fde46e 100644
@@ -49,6 +49,11 @@ config BR2_PACKAGE_FFMPEG_FFSERVER
 	help
 	  FFserver is a streaming server for both audio and video.
 
+config BR2_PACKAGE_FFMPEG_AVRESAMPLE
+	bool "Build libavresample"
+	help
+	  Avresample is a audio conversion library for compatibility.
+
 config BR2_PACKAGE_FFMPEG_POSTPROC
 	bool "Build libpostproc"
 	depends on BR2_PACKAGE_FFMPEG_GPL
package/ffmpeg/ffmpeg.mk +6 -0
index af4e1f6..0493385 100644
@@ -104,6 +104,12 @@ else
 FFMPEG_CONF_OPTS += --disable-ffserver
 endif
 
+ifeq ($(BR2_PACKAGE_FFMPEG_AVRESAMPLE),y)
+FFMPEG_CONF_OPTS += --enable-avresample
+else
+FFMPEG_CONF_OPTS += --disable-avresample
+endif
+
 ifeq ($(BR2_PACKAGE_FFMPEG_POSTPROC),y)
 FFMPEG_CONF_OPTS += --enable-postproc
 else
Signature · 1 line
1.7.10.4
#2 lore raw

PATCH v2 3/7 package/tvheadend: Needs iconv()

In reply to Bernd Kuhls

Fixes
CC src/intlconv.o
src/intlconv.c:1:19: fatal error: iconv.h: No such file or directory
#include <iconv.h>

with this defconfig

BR2_arm=y
BR2_cortex_a15=y
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
BR2_PACKAGE_TVHEADEND=y

---
 package/tvheadend/Config.in |    1 +
 1 file changed, 1 insertion(+)
package/tvheadend/Config.in +1 -0
index bb71d81..f7182a1 100644
@@ -13,6 +13,7 @@ config BR2_PACKAGE_TVHEADEND
 	# architecture is avr32, which uses gcc 4.2.
 	depends on !BR2_avr32
 	select BR2_PACKAGE_DTV_SCAN_TABLES
+	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	select BR2_PACKAGE_OPENSSL
 	help
 	  Tvheadend is a TV streaming server for Linux supporting DVB-S,
Signature · 1 line
1.7.10.4
#3 lore raw

PATCH v2 4/7 package/tvheadend: Add support for libdvbcsa

In reply to Bernd Kuhls
---
 package/tvheadend/tvheadend.mk |    7 +++++++
 1 file changed, 7 insertions(+)
package/tvheadend/tvheadend.mk +7 -0
index 1445838..767194d 100644
@@ -14,6 +14,13 @@ ifeq ($(BR2_PACKAGE_AVAHI),y)
 TVHEADEND_DEPENDENCIES += avahi
 endif
 
+ifeq ($(BR2_PACKAGE_LIBDVBCSA),y)
+TVHEADEND_DEPENDENCIES += libdvbcsa
+TVHEADEND_CONF_OPTS += --enable-dvbcsa
+else
+TVHEADEND_CONF_OPTS += --disable-dvbcsa
+endif
+
 ifeq ($(BR2_PACKAGE_LIBICONV),y)
 TVHEADEND_DEPENDENCIES += libiconv
 endif
Signature · 1 line
1.7.10.4
#4 lore raw

PATCH v2 5/7 package/tvheadend: Enable bundled build

In reply to Bernd Kuhls

host-python is needed to create a bundled version of the tvheadend binary which includes all files used by the web UI.

Having host-python alone as dependency is not enough, we need to add --enable-bundle to enable this functionality.

Also remove the now bundled webinterface files from /usr/share/tvheadend/

---
 package/tvheadend/tvheadend.mk |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
package/tvheadend/tvheadend.mk +9 -1
index 767194d..e92e12d 100644
@@ -37,6 +37,7 @@ define TVHEADEND_CONFIGURE_CMDS
 	 --cpu="$(BR2_GCC_TARGET_CPU)"		\
 	 --python="$(HOST_DIR)/usr/bin/python"	\
 	 --disable-dvbscan			\
+	 --enable-bundle			\
 	)
 endef
 
@@ -48,6 +49,13 @@ define TVHEADEND_INSTALL_TARGET_CMDS
 	$(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" install
 endef
 
+define TVHEADEND_CLEAN_SHARE
+	rm -rf "$(TARGET_DIR)/usr/share/tvheadend/docs"
+	rm -rf "$(TARGET_DIR)/usr/share/tvheadend/src"
+endef
+
+TVHEADEND_POST_INSTALL_TARGET_HOOKS += TVHEADEND_CLEAN_SHARE
+
 #----------------------------------------------------------------------------
 # To run tvheadend, we need:
 #  - a startup script, and its config file
@@ -58,7 +66,7 @@ define TVHEADEND_INSTALL_DB
 	              $(TARGET_DIR)/home/tvheadend/.hts/tvheadend/accesscontrol/1
 	chmod -R go-rwx $(TARGET_DIR)/home/tvheadend
 endef
-TVHEADEND_POST_INSTALL_TARGET_HOOKS = TVHEADEND_INSTALL_DB
+TVHEADEND_POST_INSTALL_TARGET_HOOKS += TVHEADEND_INSTALL_DB
 
 define TVHEADEND_INSTALL_INIT_SYSV
 	$(INSTALL) -D package/tvheadend/etc.default.tvheadend $(TARGET_DIR)/etc/default/tvheadend
Signature · 1 line
1.7.10.4
#5 lore raw

PATCH v2 6/7 package/tvheadend: Bump version to current git master

In reply to Bernd Kuhls
---
 package/tvheadend/tvheadend.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/tvheadend/tvheadend.mk +1 -1
index e92e12d..5d67bbe 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TVHEADEND_VERSION = ca742e00a7717787351e1a432ca9b41f93369d60
+TVHEADEND_VERSION = ddeb0020c448a61eb3cebfe89117c83719e7d838
 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
 TVHEADEND_LICENSE = GPLv3+
 TVHEADEND_LICENSE_FILES = LICENSE.md
Signature · 1 line
1.7.10.4
#6 lore raw

PATCH v2 7/7 package/tvheadend: Add transcoding support by ffmpeg

In reply to Bernd Kuhls
---
 package/tvheadend/tvheadend.mk |    8 ++++++++
 1 file changed, 8 insertions(+)
package/tvheadend/tvheadend.mk +8 -0
index 5d67bbe..92baa20 100644
@@ -14,6 +14,13 @@ ifeq ($(BR2_PACKAGE_AVAHI),y)
 TVHEADEND_DEPENDENCIES += avahi
 endif
 
+ifeq ($(BR2_PACKAGE_FFMPEG_AVRESAMPLE)$(BR2_PACKAGE_FFMPEG_SWSCALE),yy)
+TVHEADEND_DEPENDENCIES += ffmpeg
+TVHEADEND_CONF_OPTS += --enable-libav
+else
+TVHEADEND_CONF_OPTS += --disable-libav
+endif
+
 ifeq ($(BR2_PACKAGE_LIBDVBCSA),y)
 TVHEADEND_DEPENDENCIES += libdvbcsa
 TVHEADEND_CONF_OPTS += --enable-dvbcsa
@@ -38,6 +45,7 @@ define TVHEADEND_CONFIGURE_CMDS
 	 --python="$(HOST_DIR)/usr/bin/python"	\
 	 --disable-dvbscan			\
 	 --enable-bundle			\
+	 --disable-libffmpeg_static		\
 	)
 endef
 
Signature · 1 line
1.7.10.4
#7 lore raw

PATCH v2 1/7 package/libdvbcsa: New package

In reply to Bernd Kuhls

Bernd, All,

Ah, there's a new series for this... Dam, I reviewed the previous. I'll review this one a bit loater.

Regards,
Yann E. MORIN.

On 2014-10-13 19:45 +0200, Bernd Kuhls spake thusly:

Quoted 95 lines
---
 package/Config.in                |    1 +
 package/libdvbcsa/Config.in      |    9 +++++++++
 package/libdvbcsa/libdvbcsa.hash |    6 ++++++
 package/libdvbcsa/libdvbcsa.mk   |   31 +++++++++++++++++++++++++++++++
 4 files changed, 47 insertions(+)
 create mode 100644 package/libdvbcsa/Config.in
 create mode 100644 package/libdvbcsa/libdvbcsa.hash
 create mode 100644 package/libdvbcsa/libdvbcsa.mk
package/Config.in +1 -0
index 186ffea..da059d8 100644
@@ -745,6 +745,7 @@ endmenu
 menu "Multimedia"
 	source "package/libass/Config.in"
 	source "package/libbluray/Config.in"
+	source "package/libdvbcsa/Config.in"
 	source "package/libdvbsi/Config.in"
 	source "package/libdvdnav/Config.in"
 	source "package/libdvdread/Config.in"
package/libdvbcsa/Config.in new file +9 -0
new file mode 100644
index 0000000..dd7dc15
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_LIBDVBCSA
+	bool "libdvbcsa"
+	help
+	  libdvbcsa is a free implementation of the DVB Common Scrambling
+	  Algorithm - DVB/CSA - with encryption and decryption capabilities
+
+	  As libdvbcsa implements a standard, it is completely legal to use it.
+
+	  http://www.videolan.org/developers/libdvbcsa.html
package/libdvbcsa/libdvbcsa.hash new file +6 -0
new file mode 100644
index 0000000..5b3fa4c
@@ -0,0 +1,6 @@
+# From http://download.videolan.org/pub/videolan/libdvbcsa/1.1.0/libdvbcsa-1.1.0.tar.gz.sha256
+sha256	4db78af5cdb2641dfb1136fe3531960a477c9e3e3b6ba19a2754d046af3f456d	libdvbcsa-1.1.0.tar.gz
+# From http://download.videolan.org/pub/videolan/libdvbcsa/1.1.0/libdvbcsa-1.1.0.tar.gz.sha1
+sha1	5f4640a7e93ae6494f24a881414e5c343f803365				libdvbcsa-1.1.0.tar.gz
+# From http://download.videolan.org/pub/videolan/libdvbcsa/1.1.0/libdvbcsa-1.1.0.tar.gz.md5
+md5	478ab1ca56ca58d2667da6ce22f74e39					libdvbcsa-1.1.0.tar.gz
package/libdvbcsa/libdvbcsa.mk new file +31 -0
new file mode 100644
index 0000000..ef1d957
@@ -0,0 +1,31 @@
+################################################################################
+#
+# libdvbcsa
+#
+################################################################################
+
+LIBDVBCSA_VERSION = 1.1.0
+LIBDVBCSA_SITE = http://download.videolan.org/pub/videolan/libdvbcsa/$(LIBDVBCSA_VERSION)
+LIBDVBCSA_LICENSE = GPLv2+
+LIBDVBCSA_LICENSE_FILES = COPYING
+LIBDVBCSA_INSTALL_STAGING = YES
+
+ifeq ($(BR2_X86_CPU_HAS_MMX),y)
+LIBDVBCSA_CONF_OPTS += --enable-mmx
+else
+LIBDVBCSA_CONF_OPTS += --disable-mmx
+endif
+
+ifeq ($(BR2_X86_CPU_HAS_SSE2),y)
+LIBDVBCSA_CONF_OPTS += --enable-sse2
+else
+LIBDVBCSA_CONF_OPTS += --disable-sse2
+endif
+
+ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y)
+LIBDVBCSA_CONF_OPTS += --enable-altivec
+else
+LIBDVBCSA_CONF_OPTS += --disable-altivec
+endif
+
+$(eval $(autotools-package))
Signature · 6 lines
1.7.10.4

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#8 lore raw

PATCH v2 1/7 package/libdvbcsa: New package

[posted and mailed]

"Yann E. MORIN" <[email protected]> wrote in news:20141014110212.GA22208 at free.fr:

Quoted 4 lines

Bernd, All,

Ah, there's a new series for this... Dam, I reviewed the previous. I'll review this one a bit loater.

Hi,

I am preparing v3 right now, please wait with your review ;)

Regards, Bernd