Commit Graph

34 Commits

Author SHA1 Message Date
Maxime Hadjinlian
dd44b94312 package/*/*.mk: Fix indent
Fix indent for LIBFOO_USERS and LIBFOO_PERMISSIONS  as per the manual example.

Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-11-08 23:03:45 +01:00
Jerzy Grzegorek
e800531761 package: indentation cleanup
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-11-02 23:27:01 +01:00
Bernd Kuhls
5d03ecb772 package/tvheadend: Needs python2 host package
Fixes
http://autobuild.buildroot.net/results/3aa/3aaa28eb4fd04a5b578c5128b57ce89165e473be/
http://autobuild.buildroot.net/results/467/467df0fde737de0ec89fe023b2ce33546543d335/
http://autobuild.buildroot.net/results/f5a/f5aa44e0a96820fb8edd47e8096131b68f64f6a7/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-11-01 15:55:52 +01:00
Bernd Kuhls
eb20aca0fd package/tvheadend: Bump version to current git master
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-11-01 14:48:01 +01:00
Bernd Kuhls
ad41eda9e8 package/tvheadend: Add transcoding support by ffmpeg
Add --disable-libffmpeg_static to disable static linking of ffmpeg
libraries into the tvheadend binary.

tvheadend compiles with ffmpeg using this minimal defconfig:

BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
BR2_PACKAGE_FFMPEG=y
BR2_PACKAGE_TVHEADEND=y

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-11-01 14:47:46 +01:00
Maxime Hadjinlian
1cce8adc33 tvheadend: bump version
Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Acked-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-10-28 22:11:57 +01:00
Bernd Kuhls
5711bd0918 package/tvheadend: Bump version to current git master
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-10-28 22:07:42 +01:00
Bernd Kuhls
843db449d9 package/tvheadend: Enable bundled build
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/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-10-28 22:07:29 +01:00
Bernd Kuhls
050ca88db3 package/tvheadend: Add support for libdvbcsa
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-10-28 22:04:48 +01:00
Thomas De Schampheleire
f268f7131b .mk files: bulk aligment and whitespace cleanup of assignments
The Buildroot coding style defines one space around make assignments and
does not align the assignment symbols.

This patch does a bulk fix of offending packages. The package
infrastructures (or more in general assignments to calculated variable
names, like $(2)_FOO) are not touched.

Alignment of line continuation characters (\) is kept as-is.

The sed command used to do this replacement is:
find * -name "*.mk" | xargs sed -i \
    -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#'
    -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#'
    -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#'
    -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#'

Brief explanation of this command:
    ^\([A-Z0-9a-z_]\+\)     a regular variable at the beginning of the line
    \([?:+]\?=\)            any assignment character =, :=, ?=, +=
    \([^\\]\+\)             any string not containing a line continuation
    \([^\\ \t]\+\s*\\\)     string, optional whitespace, followed by a
                            line continuation character
    \(\s*\\\)               optional whitespace, followed by a line
                            continuation character

Hence, the first subexpression handles empty assignments, the second
handles regular assignments, the third handles regular assignments with
line continuation, and the fourth empty assignments with line
continuation.

This expression was tested on following test text: (initial tab not
included)

	FOO     = spaces before
	FOO     =   spaces before and after
	FOO	= tab before
	FOO	  = tab and spaces before
	FOO =	tab after
	FOO =	   tab and spaces after
	FOO =   	spaces and tab after
	FOO =    \
	FOO = bar \
	FOO = bar space    \
	FOO   =		   \
	GENIMAGE_DEPENDENCIES   = host-pkgconf libconfuse
	FOO     += spaces before
	FOO     ?=   spaces before and after
	FOO     :=
	FOO     =
	FOO	=
	FOO	  =
	FOO =
	   $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C
	AT91BOOTSTRAP3_DEFCONFIG = \
	AXEL_DISABLE_I18N=--i18n=0

After this bulk change, following manual fixups were done:
- fix line continuation alignment in cegui06 and spice (the sed
  expression leaves the number of whitespace between the value and line
  continuation character intact, but the whitespace before that could have
  changed, causing misalignment.
- qt5base was reverted, as this package uses extensive alignment which
  actually makes the code more readable.

Finally, the end result was manually reviewed.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Cc: Yann E. Morin <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 15:00:28 +02:00
Bernd Kuhls
0d6adb4bc3 package/tvheadend: Bump version
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-09-04 17:25:17 +02:00
Bernd Kuhls
2d93a7bfd6 package/tvheadend: Bump version to current git master
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-07-26 08:52:33 +02:00
Bernd Kuhls
a27065eb03 package/tvheadend: Add optional dependency to libiconv
To get reproducable builds depend on libiconv if needed.

tvheadend configure either shows

  checking for cc libiconv ...                      fail

or

  checking for cc libiconv ...                      ok

depending on the presence of libiconv, and gets linked

output/host/usr/bin/i586-buildroot-linux-uclibc-readelf -a output/target/usr/bin/tvheadend | grep NEEDED | grep iconv
 0x00000001 (NEEDED)                     Shared library: [libiconv.so.2]

Please note that libiconv is not a hard-dependency.

Tested with minimal defconfig

BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
BR2_PACKAGE_LIBICONV=y
BR2_PACKAGE_TVHEADEND=y

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-06-11 15:18:20 +02:00
Bernd Kuhls
826fb12210 package/tvheadend: Bump version
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-06-09 19:57:14 +02:00
Bernd Kuhls
c1423d3ada package/tvheadend: Properly disable internal fetch of dvb-data
Fixes
http://autobuild.buildroot.net/results/a8a/a8a8e39d57b14f1a59c8e6322b511c761442ee3c/
http://autobuild.buildroot.net/results/227/2278a078af5cc2e9f36661ad11e70b7692481266/

Instead of patching the buildsystem just use the included option --disable-
dvbscan, therefore remove tvheadend-001-no-auto-download-dvbscans.patch

This should also point tvheadend to the right place for the dvb data according
to src/input/mpegts/scanfile.c:

  #if ENABLE_DVBSCAN
    path = "data/dvb-scan";
  #else
    path = "/usr/share/dvb";
  #endif

and the resulting binary:

strings tvheadend | grep "dvb-scan\|share\/dvb"
/usr/share/dvb

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-06-09 19:56:53 +02:00
Thomas Petazzoni
bb89d10075 tvheadend: fix license file variable after version bump
Fixes:

  http://autobuild.buildroot.org/results/a8a/a8a5a17faa069abdde7cfc58da327c292874069f/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-06-03 09:17:22 +02:00
Yann E. MORIN
dd15da6b4e package/tvheadend: bump version
Lotta fixes all over the tree.
Still no new release... :-/

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-06-02 12:45:37 +02:00
Thomas De Schampheleire
ce6b23a2ee github packages: use tarball download via github helper iso git clone
Tarball download from github is preferred, because:
- download size is smaller
- git clone may be blocked in some corporate environments

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-05-05 21:54:28 +02:00
Yann E. MORIN
5e829e5f9a package/tvheadend: do not line-up variables
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-03-29 18:31:35 +01:00
Yann E. MORIN
7b6a2df492 package/tvheadend: bump revision
Adds a bunch of fixes all over the place.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-03-29 18:31:03 +01:00
Yann E. MORIN
9981956b89 package/tvheadend: transponders data now provided by dtv-scan-tables
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-03-29 18:29:29 +01:00
Yann E. MORIN
cddec3093e package/tvheadend: bump version
The list of changes is too long to repeat here, but lots of fixes
and improvements, plus a brand new rewrite of the DVB handling code.

Refresh patches, except patch 4 which has now been upstreamed.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-03-11 11:46:35 +01:00
Martin Bark
1889207631 tvheadend: fix error compiling with ccache
The tvheadend configure script fails to correctly handle spaces in any of
the options passed to it.  If ccache is used the configure script fails to
handle the space in the --cc option and errors.  Also the --cflags option
fails to handle multiple entries and only uses the first one.  This patch
simple removes setting the --cc and --cflags options as the configure
script will correctly use the CC and CFLAGS variables already passed in
TARGET_CONFIGURE_OPTS.

Signed-off-by: Martin Bark <martin@barkynet.com>
Cc: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-21 21:57:46 +01:00
Yann E. MORIN
50a8ff5c5b package/tvheadend: unbreak
tvheadend tries to impersonate an autotools package, when it is not.
This breaks the build.

tvheadend's ./configure tries to run compiled code.
This breaks the build.

Switch tvheadend over to using the generic-package infrastructure,
and provide carefully-crafted _CMDS for each steps.

We still keep a post-install hook to install our "DB" since it is not
part of tvheadend, but an addition of our own packaging of tvheadend.

Fixes:
    http://autobuild.buildroot.net/results/3ea/3eaa17b94975477263fe12e201eec9cbeeb2912c/
    http://autobuild.buildroot.net/results/7c8/7c85db0dfab98808c97a5ef17dec9d1071dc0d49/
and a few others as well.

[Peter: tweak 004-dont-run-compiled-code.patch description as pointed out by Thomas]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-12-04 10:13:28 +01:00
Yann E. MORIN
c04fda98fe package/tvheadend: bump version
Misc fixes and improvements all over the place, mostly fixes.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-12-01 23:51:15 +01:00
Thomas De Schampheleire
e6ea6b7865 git packages: use full revision hash
There is no benefit in using the shortened git revision hash. On the
contrary: the shorter the hash, the higher the risk of having collisions
with another commit.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2013-11-02 16:16:54 +01:00
Yann E. MORIN
b7a0eb4d0f package/tvheadend: bump for misc fixes
Bump to the latest cset in master for a bunch of fixes
for transconding, muxer and html5 video.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-09-22 11:47:16 +02:00
Yann E. MORIN
8507f38e88 package/tvheadend: bump version
... for a truck-load of memory-leak and other various fixes.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-07-07 21:45:10 +02:00
Yann E. MORIN
44d5038fa3 package/tvheadend: bump version for libav fixes
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-06-27 15:51:19 +02:00
Alexandre Belloni
8dfd59d114 Normalize separator size to 80
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-06-06 22:30:24 +02:00
Yann E. MORIN
a9a12f03e9 package/tvheadend: update to a git snapshot
There are a buncha fixes that are not available in a release yet.

Needs refreshing our patches.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-06-03 23:00:27 +02:00
Yann E. MORIN
5c1f1536d6 package/tvheadend: use a non-root user to run the daemon
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-04-25 22:57:00 +02:00
Yann E. MORIN
4667e1cb86 package/tvheadend: update to v3.5
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-02-22 23:34:39 +01:00
Yann E. MORIN
14989d0be5 package/tvheadend: new package
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-12-28 23:40:26 +01:00