* [Buildroot] [PATCH 1/3] package/tvheadend: bump version
@ 2017-04-08 15:18 Bernd Kuhls
2017-04-08 15:18 ` [Buildroot] [PATCH 2/3] package/pngquant: new package Bernd Kuhls
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Bernd Kuhls @ 2017-04-08 15:18 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/tvheadend/tvheadend.hash | 3 ++-
package/tvheadend/tvheadend.mk | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash
index afd651003..fe99e4553 100644
--- a/package/tvheadend/tvheadend.hash
+++ b/package/tvheadend/tvheadend.hash
@@ -1,2 +1,3 @@
# Locally computed
-sha256 e58f5b2fded91fa085961402db26b54d5338c70e5bebdb0f34d55beb4d5551b4 tvheadend-b142383a7cf51180e00ebb1c13205c14d24338dc.tar.gz
+sha256 94efc13b6c80c204dc4e3cf2ac79632f3c2cafe9cad4ee8948a71be6e4569a16 tvheadend-5cbaac172b4997fbf89667d79ac6e03b46460060.tar.gz
+
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index b82ebc914..c2981ff22 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -4,7 +4,7 @@
#
################################################################################
-TVHEADEND_VERSION = b142383a7cf51180e00ebb1c13205c14d24338dc
+TVHEADEND_VERSION = 5cbaac172b4997fbf89667d79ac6e03b46460060
TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
TVHEADEND_LICENSE = GPL-3.0+
TVHEADEND_LICENSE_FILES = LICENSE.md
--
2.11.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Buildroot] [PATCH 2/3] package/pngquant: new package
2017-04-08 15:18 [Buildroot] [PATCH 1/3] package/tvheadend: bump version Bernd Kuhls
@ 2017-04-08 15:18 ` Bernd Kuhls
2017-04-09 14:05 ` Thomas Petazzoni
2017-04-08 15:18 ` [Buildroot] [PATCH 3/3] package/tvheadend: reduce target binary size by using pngquant Bernd Kuhls
2017-04-08 19:44 ` [Buildroot] [PATCH 1/3] package/tvheadend: bump version Thomas Petazzoni
2 siblings, 1 reply; 6+ messages in thread
From: Bernd Kuhls @ 2017-04-08 15:18 UTC (permalink / raw)
To: buildroot
The host package will be needed by tvheadend.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
DEVELOPERS | 1 +
package/Config.in | 1 +
package/pngquant/Config.in | 9 +++++++
package/pngquant/pngquant.hash | 4 ++++
package/pngquant/pngquant.mk | 53 ++++++++++++++++++++++++++++++++++++++++++
5 files changed, 68 insertions(+)
create mode 100644 package/pngquant/Config.in
create mode 100644 package/pngquant/pngquant.hash
create mode 100644 package/pngquant/pngquant.mk
diff --git a/DEVELOPERS b/DEVELOPERS
index c00417ce6..8067c316a 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -251,6 +251,7 @@ F: package/perl-timedate/
F: package/perl-uri/
F: package/perl-www-robotrules/
F: package/pixman/
+F: package/pngquant/
F: package/pound/
F: package/pure-ftpd/
F: package/python-couchdb/
diff --git a/package/Config.in b/package/Config.in
index 7641fc9de..35305d798 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -246,6 +246,7 @@ comment "Graphic applications"
source "package/kmscube/Config.in"
source "package/libva-utils/Config.in"
source "package/mesa3d-demos/Config.in"
+ source "package/pngquant/Config.in"
source "package/qt5cinex/Config.in"
source "package/rrdtool/Config.in"
source "package/tesseract-ocr/Config.in"
diff --git a/package/pngquant/Config.in b/package/pngquant/Config.in
new file mode 100644
index 000000000..c63f0f9d0
--- /dev/null
+++ b/package/pngquant/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_PNGQUANT
+ bool "pngquant"
+ select BR2_PACKAGE_LIBPNG
+ select BR2_PACKAGE_ZLIB
+ help
+ Lossy PNG compressor ? pngquant command and libimagequant
+ library
+
+ https://pngquant.org
diff --git a/package/pngquant/pngquant.hash b/package/pngquant/pngquant.hash
new file mode 100644
index 000000000..c9f449eb4
--- /dev/null
+++ b/package/pngquant/pngquant.hash
@@ -0,0 +1,4 @@
+# From https://pngquant.org/releases.html
+sha1 08ed436e21429d4983bee0fe069681c458f95209 pngquant-2.9.1-src.tar.gz
+# Locally computed
+sha256 ac2138207ef40acd4e5fdae18798139a9d75dae4f1d0837aea918a2a8c433481 pngquant-2.9.1-src.tar.gz
diff --git a/package/pngquant/pngquant.mk b/package/pngquant/pngquant.mk
new file mode 100644
index 000000000..ae681d68d
--- /dev/null
+++ b/package/pngquant/pngquant.mk
@@ -0,0 +1,53 @@
+################################################################################
+#
+# pngquant
+#
+################################################################################
+
+PNGQUANT_VERSION = 2.9.1
+PNGQUANT_SOURCE = pngquant-$(PNGQUANT_VERSION)-src.tar.gz
+PNGQUANT_SITE = https://pngquant.org
+PNGQUANT_LICENSE = GPL-3.0+
+PNGQUANT_LICENSE_FILES = COPYRIGHT
+HOST_PNGQUANT_DEPENDENCIES = host-libpng
+PNGQUANT_DEPENDENCIES = libpng
+
+ifeq ($(BR2_PACKAGE_LCMS2),y)
+PNGQUANT_DEPENDENCIES += lcms2
+endif
+
+define HOST_PNGQUANT_CONFIGURE_CMDS
+ (cd $(@D) && \
+ $(HOST_CONFIGURE_OPTS) \
+ ./configure --prefix=/usr \
+ --without-lcms2 \
+ )
+endef
+
+define PNGQUANT_CONFIGURE_CMDS
+ (cd $(@D) && \
+ $(TARGET_CONFIGURE_OPTS) \
+ ./configure --prefix=/usr \
+ $(if $(BR2_PACKAGE_LCMS2),--with-lcms2,--without-lcms2) \
+ $(if $(BR2_X86_CPU_HAS_SSE),--enable-sse,--disable-sse) \
+ )
+endef
+
+define HOST_PNGQUANT_BUILD_CMDS
+ $(HOST_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define PNGQUANT_BUILD_CMDS
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define HOST_PNGQUANT_INSTALL_CMDS
+ $(HOST_MAKE_ENV) $(MAKE) PREFIX="$(HOST_DIR)/usr" -C $(@D) install
+endef
+
+define PNGQUANT_INSTALL_TARGET_CMDS
+ $(TARGET_MAKE_ENV) $(MAKE) PREFIX="$(TARGET_DIR)/usr" -C $(@D) install
+endef
+
+$(eval $(host-generic-package))
+$(eval $(generic-package))
--
2.11.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/3] package/pngquant: new package
2017-04-08 15:18 ` [Buildroot] [PATCH 2/3] package/pngquant: new package Bernd Kuhls
@ 2017-04-09 14:05 ` Thomas Petazzoni
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2017-04-09 14:05 UTC (permalink / raw)
To: buildroot
Hello,
On Sat, 8 Apr 2017 17:18:03 +0200, Bernd Kuhls wrote:
> +define HOST_PNGQUANT_CONFIGURE_CMDS
> + (cd $(@D) && \
> + $(HOST_CONFIGURE_OPTS) \
> + ./configure --prefix=/usr \
--prefix=/usr is not correct for host packages, it should be
--prefix=$(HOST_DIR)/usr.
> +define HOST_PNGQUANT_INSTALL_CMDS
> + $(HOST_MAKE_ENV) $(MAKE) PREFIX="$(HOST_DIR)/usr" -C $(@D) install
Then passing PREFIX= here becomes useless.
> +define PNGQUANT_INSTALL_TARGET_CMDS
> + $(TARGET_MAKE_ENV) $(MAKE) PREFIX="$(TARGET_DIR)/usr" -C $(@D) install
And here passing DESTDIR=$(TARGET_DIR) makes more sense, since
--prefix=/usr is passed at configuration time.
I've fixed this, and grouped together the host configure/build/install
commands, and then applied.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 3/3] package/tvheadend: reduce target binary size by using pngquant
2017-04-08 15:18 [Buildroot] [PATCH 1/3] package/tvheadend: bump version Bernd Kuhls
2017-04-08 15:18 ` [Buildroot] [PATCH 2/3] package/pngquant: new package Bernd Kuhls
@ 2017-04-08 15:18 ` Bernd Kuhls
2017-04-09 14:06 ` Thomas Petazzoni
2017-04-08 19:44 ` [Buildroot] [PATCH 1/3] package/tvheadend: bump version Thomas Petazzoni
2 siblings, 1 reply; 6+ messages in thread
From: Bernd Kuhls @ 2017-04-08 15:18 UTC (permalink / raw)
To: buildroot
Support was added by this commit:
https://github.com/tvheadend/tvheadend/commit/8bf3932539ceadb3bfc1c9453f11175f15aefad2
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/tvheadend/tvheadend.mk | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index c2981ff22..0336019bc 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -11,6 +11,7 @@ TVHEADEND_LICENSE_FILES = LICENSE.md
TVHEADEND_DEPENDENCIES = \
host-gettext \
host-pkgconf \
+ host-pngquant \
$(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python) \
openssl
@@ -81,12 +82,19 @@ define TVHEADEND_CONFIGURE_CMDS
--python="$(HOST_DIR)/usr/bin/python" \
--enable-dvbscan \
--enable-bundle \
+ --enable-pngquant \
--disable-ffmpeg_static \
--disable-hdhomerun_static \
$(TVHEADEND_CONF_OPTS) \
)
endef
+define TVHEADEND_FIX_PNGQUANT_PATH
+ $(SED) "s%^pngquant_bin =.*%pngquant_bin = '$(HOST_DIR)/usr/bin/pngquant'%" \
+ $(@D)/support/mkbundle
+endef
+TVHEADEND_POST_CONFIGURE_HOOKS += TVHEADEND_FIX_PNGQUANT_PATH
+
define TVHEADEND_BUILD_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
endef
--
2.11.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/3] package/tvheadend: bump version
2017-04-08 15:18 [Buildroot] [PATCH 1/3] package/tvheadend: bump version Bernd Kuhls
2017-04-08 15:18 ` [Buildroot] [PATCH 2/3] package/pngquant: new package Bernd Kuhls
2017-04-08 15:18 ` [Buildroot] [PATCH 3/3] package/tvheadend: reduce target binary size by using pngquant Bernd Kuhls
@ 2017-04-08 19:44 ` Thomas Petazzoni
2 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2017-04-08 19:44 UTC (permalink / raw)
To: buildroot
Hello,
On Sat, 8 Apr 2017 17:18:02 +0200, Bernd Kuhls wrote:
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> package/tvheadend/tvheadend.hash | 3 ++-
> package/tvheadend/tvheadend.mk | 2 +-
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash
> index afd651003..fe99e4553 100644
> --- a/package/tvheadend/tvheadend.hash
> +++ b/package/tvheadend/tvheadend.hash
> @@ -1,2 +1,3 @@
> # Locally computed
> -sha256 e58f5b2fded91fa085961402db26b54d5338c70e5bebdb0f34d55beb4d5551b4 tvheadend-b142383a7cf51180e00ebb1c13205c14d24338dc.tar.gz
> +sha256 94efc13b6c80c204dc4e3cf2ac79632f3c2cafe9cad4ee8948a71be6e4569a16 tvheadend-5cbaac172b4997fbf89667d79ac6e03b46460060.tar.gz
> +
This empty new line at the end of the file was not needed, so I've
removed it and applied. Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-04-09 14:06 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-08 15:18 [Buildroot] [PATCH 1/3] package/tvheadend: bump version Bernd Kuhls
2017-04-08 15:18 ` [Buildroot] [PATCH 2/3] package/pngquant: new package Bernd Kuhls
2017-04-09 14:05 ` Thomas Petazzoni
2017-04-08 15:18 ` [Buildroot] [PATCH 3/3] package/tvheadend: reduce target binary size by using pngquant Bernd Kuhls
2017-04-09 14:06 ` Thomas Petazzoni
2017-04-08 19:44 ` [Buildroot] [PATCH 1/3] package/tvheadend: bump version Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox