[Buildroot] [PATCH v2 1/2] bitstream: new package

[Buildroot] [PATCH v2 1/2] bitstream: new package

[Julian Scheel]

BiTStream is a set of headers to ease processing of mpeg ts streams. It is
used by dvblast.

Signed-off-by: Julian Scheel <julian@jusst.de>
---
Changelog v2:

Address review comments by Yann E. Morin (thanks for review!)
- Lowercase package name
- Add comment about installation settings
- Fix install command

---
 package/Config.in              |  1 +
 package/bitstream/Config.in    |  8 ++++++++
 package/bitstream/bitstream.mk | 20 ++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 package/bitstream/Config.in
 create mode 100644 package/bitstream/bitstream.mk

diff --git a/package/Config.in b/package/Config.in
index 98dcd78..53a312c 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -954,6 +954,7 @@ menu "Logging"
 endmenu
 
 menu "Multimedia"
+	source "package/bitstream/Config.in"
 	source "package/libass/Config.in"
 	source "package/libbluray/Config.in"
 	source "package/libdcadec/Config.in"
diff --git a/package/bitstream/Config.in b/package/bitstream/Config.in
new file mode 100644
index 0000000..35d778a
--- /dev/null
+++ b/package/bitstream/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_BITSTREAM
+	bool "bitstream"
+	help
+	  biTStream is a set of C headers allowing a simpler access to
+	  binary structures such as specified by MPEG, DVB, IETF, SMPTE,
+	  IEEE, SCTE, etc.
+
+	  http://www.videolan.org/developers/bitstream.html
diff --git a/package/bitstream/bitstream.mk b/package/bitstream/bitstream.mk
new file mode 100644
index 0000000..cf57c1d
--- /dev/null
+++ b/package/bitstream/bitstream.mk
@@ -0,0 +1,20 @@
+################################################################################
+#
+# biTStream
+#
+################################################################################
+
+BITSTREAM_VERSION = 1.1
+BITSTREAM_SOURCE = bitstream-$(BITSTREAM_VERSION).tar.bz2
+BITSTREAM_SITE = https://get.videolan.org/bitstream/$(BITSTREAM_VERSION)
+BITSTREAM_LICENSE = MIT
+
+# package consists of header files only
+BITSTREAM_INSTALL_STAGING = YES
+BITSTREAM_INSTALL_TARGET = NO
+
+define BITSTREAM_INSTALL_STAGING_CMDS
+	$(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) PREFIX=/usr install
+endef
+
+$(eval $(generic-package))
-- 
2.6.0

[Buildroot] [PATCH v2 2/2] dvblast: new package

[Julian Scheel]

DVBlast is a simple and powerful MPEG-2/TS demux and streaming application.

Signed-off-by: Julian Scheel <julian@jusst.de>
---
Changelog v2:

Address review comments by Yann E. Morin (thanks for review!)
- Complete license information
- Remove explicit INSTALL_STAGING=no
- Fix install command

The build cmd is not changed to use TARGET_CONFIGURE_OPTS as it breaks the
build.
---
 package/Config.in          |  1 +
 package/dvblast/Config.in  | 10 ++++++++++
 package/dvblast/dvblast.mk | 25 +++++++++++++++++++++++++
 3 files changed, 36 insertions(+)
 create mode 100644 package/dvblast/Config.in
 create mode 100644 package/dvblast/dvblast.mk

diff --git a/package/Config.in b/package/Config.in
index 53a312c..cf0e46d 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -7,6 +7,7 @@ menu "Audio and video applications"
 	source "package/alsa-utils/Config.in"
 	source "package/aumix/Config.in"
 	source "package/bellagio/Config.in"
+	source "package/dvblast/Config.in"
 	source "package/dvdauthor/Config.in"
 	source "package/dvdrw-tools/Config.in"
 	source "package/espeak/Config.in"
diff --git a/package/dvblast/Config.in b/package/dvblast/Config.in
new file mode 100644
index 0000000..3b9b8d1
--- /dev/null
+++ b/package/dvblast/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_DVBLAST
+	bool "dvblast"
+	select BR2_PACKAGE_BITSTREAM
+	select BR2_PACKAGE_LIBEV
+	depends on !BR2_bfin  # libev
+	help
+	  DVBlast is a simple and powerful MPEG-2/TS demux and streaming
+	  application.
+
+	  http://www.videolan.org/projects/dvblast.html
diff --git a/package/dvblast/dvblast.mk b/package/dvblast/dvblast.mk
new file mode 100644
index 0000000..5768f28
--- /dev/null
+++ b/package/dvblast/dvblast.mk
@@ -0,0 +1,25 @@
+################################################################################
+#
+# dvblast
+#
+################################################################################
+
+DVBLAST_VERSION = 3.0
+DVBLAST_SOURCE = dvblast-$(DVBLAST_VERSION).tar.bz2
+DVBLAST_SITE = https://get.videolan.org/dvblast/$(DVBLAST_VERSION)
+DVBLAST_LICENSE = GPLv2+, WTFPL
+DVBLAST_LICENSE_FILES = COPYING COPYING.WTFPL
+
+DVBLAST_DEPENDENCIES = bitstream libev
+
+DVBLAST_INSTALL_TARGET = YES
+
+define DVBLAST_BUILD_CMDS
+	$(MAKE) -C $(@D) CC="$(TARGET_CC)" LD="$(TARGET_LD)"
+endef
+
+define DVBLAST_INSTALL_TARGET_CMDS
+	$(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) PREFIX=/usr install
+endef
+
+$(eval $(generic-package))
-- 
2.6.0

[Buildroot] [PATCH v2 2/2] dvblast: new package

[Thomas Petazzoni]

Dear Julian Scheel,

On Sun, 18 Oct 2015 14:34:11 +0200, Julian Scheel wrote:
> DVBlast is a simple and powerful MPEG-2/TS demux and streaming application.
> 
> Signed-off-by: Julian Scheel <julian@jusst.de>
> ---
> Changelog v2:
> 
> Address review comments by Yann E. Morin (thanks for review!)
> - Complete license information
> - Remove explicit INSTALL_STAGING=no

You should have also removed INSTALL_TARGET = YES, because that's the
default.

> - Fix install command
> 
> The build cmd is not changed to use TARGET_CONFIGURE_OPTS as it breaks the
> build.

A working solution is to pass TARGET_CONFIGURE_OPTS in the environment
of make instead of as an option. This ensures that the CFLAGS += in the
dvblast Makefile are still taken into account.

So, I've applied you patch, with the following changes:

    [Thomas:
     - add missing hash file.
     - rewrap Config.in help text
     - remove unneeded "DVBLAST_INSTALL_TARGET = YES", since this is the
       default behavior
     - pass TARGET_MAKE_ENV in the environment when calling make.
     - use TARGET_CONFIGURE_OPTS instead of just CC/LD.]

Thanks a lot!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH v2 2/2] dvblast: new package

[Julian Scheel]

Hi Thomas,

On 18.10.15 16:06, Thomas Petazzoni wrote:
>> Address review comments by Yann E. Morin (thanks for review!)
>> - Complete license information
>> - Remove explicit INSTALL_STAGING=no
>
> You should have also removed INSTALL_TARGET = YES, because that's the
> default.

Ack, makes sense.

>> - Fix install command
>>
>> The build cmd is not changed to use TARGET_CONFIGURE_OPTS as it breaks the
>> build.
>
> A working solution is to pass TARGET_CONFIGURE_OPTS in the environment
> of make instead of as an option. This ensures that the CFLAGS += in the
> dvblast Makefile are still taken into account.

Ah, thanks, good to know. I'll keep it in mind.

> So, I've applied you patch, with the following changes:
>
>      [Thomas:
>       - add missing hash file.

Nice, I actually hadn't even realized that buildroot has hash files so 
far :)

>       - rewrap Config.in help text
>       - remove unneeded "DVBLAST_INSTALL_TARGET = YES", since this is the
>         default behavior
>       - pass TARGET_MAKE_ENV in the environment when calling make.
>       - use TARGET_CONFIGURE_OPTS instead of just CC/LD.]
>
> Thanks a lot!

Thanks for applying.

-Julian

[Buildroot] [PATCH v2 1/2] bitstream: new package

[Thomas Petazzoni]

Dear Julian Scheel,

On Sun, 18 Oct 2015 14:34:10 +0200, Julian Scheel wrote:
> BiTStream is a set of headers to ease processing of mpeg ts streams. It is
> used by dvblast.
> 
> Signed-off-by: Julian Scheel <julian@jusst.de>
> ---
> Changelog v2:

Applied after doing some additional changes:

    [Thomas:
     - add missing hash file.
     - add missing BITSTREAM_LICENSE_FILES information.
     - rewrap Config.in help text.
     - use lowercase name for the package in the comment header in
       bitstream.mk.]
    

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com