package/liburiparser: New package

PATCH New Bernd Kuhls 2 participants 6 messages Nov 23, 2014 – Nov 26, 2014

lore

Share & tools

lore

Bernd Kuhls

author

2014-11-23 19:56 UTC #0 lore raw

PATCH 1/3 package/liburiparser: New package

Signed-off-by Bernd Kuhls <[email protected]>

---
 package/Config.in                      |    1 +
 package/liburiparser/Config.in         |    7 +++++++
 package/liburiparser/liburiparser.hash |    3 +++
 package/liburiparser/liburiparser.mk   |   19 +++++++++++++++++++
 4 files changed, 30 insertions(+)
 create mode 100644 package/liburiparser/Config.in
 create mode 100644 package/liburiparser/liburiparser.hash
 create mode 100644 package/liburiparser/liburiparser.mk

package/Config.in +1 -0

index 796c9f9..6f32b71 100644
@@ -829,6 +829,7 @@ menu "Networking"
 	source "package/libupnpp/Config.in"
 	source "package/libvncserver/Config.in"
 	source "package/libwebsockets/Config.in"
+	source "package/liburiparser/Config.in"
 	source "package/neon/Config.in"
 	source "package/nss-mdns/Config.in"
 	source "package/omniorb/Config.in"

package/liburiparser/Config.in new file +7 -0

new file mode 100644
index 0000000..95a6fe8
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_LIBURIPARSER
+	bool "liburiparser"
+	help
+	  uriparser is a strictly RFC 3986 compliant URI parsing and handling
+	  library written in C.
+
+	  http://uriparser.sourceforge.net

package/liburiparser/liburiparser.hash new file +3 -0

new file mode 100644
index 0000000..84340f8
@@ -0,0 +1,3 @@
+# From http://sourceforge.net/projects/uriparser/files/Sources/0.8.1/
+md5	4e4c5f0ee6abb111a431c45e144247aa		uriparser-0.8.1.tar.bz2
+sha1	4405d8baa0d9f5bc0319e6d5e68770acab67b602	uriparser-0.8.1.tar.bz2

package/liburiparser/liburiparser.mk new file +19 -0

new file mode 100644
index 0000000..d8c12e3
@@ -0,0 +1,19 @@
+################################################################################
+#
+# liburiparser
+#
+################################################################################
+
+LIBURIPARSER_VERSION = 0.8.1
+LIBURIPARSER_SOURCE = uriparser-$(LIBURIPARSER_VERSION).tar.bz2
+LIBURIPARSER_SITE = http://sourceforge.net/projects/uriparser/files/Sources/$(LIBURIPARSER_VERSION)
+LIBURIPARSER_LICENSE = BSD-3c
+LIBURIPARSER_LICENSE_FILES = COPYING
+LIBURIPARSER_INSTALL_STAGING = YES
+LIBURIPARSER_CONF_OPTS = --disable-test
+
+ifneq ($(BR2_USE_WCHAR),y)
+LIBURIPARSER_CONF_OPTS += --disable-wchar_t
+endif
+
+$(eval $(autotools-package))

Signature · 1 line

1.7.10.4

Bernd Kuhls

author

2014-11-23 19:56 UTC #1 lore raw

PATCH 2/3 package/tvheadend: Add support for liburiparser

Signed-off-by Bernd Kuhls <[email protected]>

---
 package/tvheadend/tvheadend.mk |    6 ++++++
 1 file changed, 6 insertions(+)

package/tvheadend/tvheadend.mk +6 -0

index 0fd6eea..4921da4 100644
@@ -32,12 +32,18 @@ ifeq ($(BR2_PACKAGE_LIBICONV),y)
 TVHEADEND_DEPENDENCIES += libiconv
 endif
 
+ifeq ($(BR2_PACKAGE_LIBURIPARSER),y)
+TVHEADEND_DEPENDENCIES += liburiparser
+TVHEADEND_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) $(if $(BR2_USE_WCHAR),,-DURI_NO_UNICODE)"
+endif
+
 TVHEADEND_DEPENDENCIES += dtv-scan-tables
 
 define TVHEADEND_CONFIGURE_CMDS
 	(cd $(@D);				\
 	 $(TARGET_CONFIGURE_OPTS)		\
 	 $(TARGET_CONFIGURE_ARGS)		\
+	 $(TVHEADEND_CONF_ENV)			\
 	 ./configure				\
 	 --prefix=/usr				\
 	 --arch="$(ARCH)"			\

Signature · 1 line

1.7.10.4

Thomas Petazzoni

2014-11-26 21:51 UTC #2 lore raw

PATCH 2/3 package/tvheadend: Add support for liburiparser

Dear Bernd Kuhls,

package/tvheadend/tvheadend.mk ifeq ($(BR2_PACKAGE_LIBICONV),y) · line 37

Quoted 3 lines · Bernd Kuhls

package/tvheadend/tvheadend.mk +3 -0

+ifeq ($(BR2_PACKAGE_LIBURIPARSER),y)
+TVHEADEND_DEPENDENCIES += liburiparser
+TVHEADEND_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) $(if $(BR2_USE_WCHAR),,-DURI_NO_UNICODE)"

This is a little bit dangerous, because if another part of tvheadend.mk wants to add some stuff to the CFLAGS, it will no longer be possible. It would have been a bit better to do:

TVHEADEND_CFLAGS = $(TARGET_CFLAGS)
ifeq ($(BR2_PACKAGE_LIBURIPARSER),y) TVHEADEND_CFLAGS += $(if $(BR2_USE_WCHAR),,-DURI_NO_UNICODE) endif

and then:

package/tvheadend/tvheadend.mk ifeq ($(BR2_PACKAGE_LIBICONV),y) · line 46

Quoted 7 lines

TVHEADEND_DEPENDENCIES += dtv-scan-tables
define TVHEADEND_CONFIGURE_CMDS
package/tvheadend/tvheadend.mk +1 -0
 	(cd $(@D);				\
 	 $(TARGET_CONFIGURE_OPTS)		\
 	 $(TARGET_CONFIGURE_ARGS)		\
+	 $(TVHEADEND_CONF_ENV)			\

	 CFLAGS="$(TVHEADEND_CFLAGS)"

I have nonetheless committed your proposal to next, it will always be time to improve things later when a second condition needs to adjust the CFLAGS.

Thanks,

Thomas

Signature · 3 lines

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

Bernd Kuhls

author

2014-11-23 19:56 UTC #3 lore raw

PATCH 3/3 package/tvheadend: Bump version

In reply to Bernd Kuhls

Signed-off-by Bernd Kuhls <[email protected]>

---
 package/tvheadend/tvheadend.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

package/tvheadend/tvheadend.mk +1 -1

index 4921da4..0481731 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TVHEADEND_VERSION = c053acd84e5cc48a3e70047f228728bf039cfacd
+TVHEADEND_VERSION = d6bfd1ffe62e145a6a6e18d00ee722204ee898d4
 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
 TVHEADEND_LICENSE = GPLv3+
 TVHEADEND_LICENSE_FILES = LICENSE.md

Signature · 1 line

1.7.10.4

Thomas Petazzoni

2014-11-26 21:52 UTC #4 lore raw

PATCH 3/3 package/tvheadend: Bump version

Dear Bernd Kuhls,

package/tvheadend/tvheadend.mk line 10

Quoted 5 lines · Bernd Kuhls

package/tvheadend/tvheadend.mk +1 -1

-TVHEADEND_VERSION = c053acd84e5cc48a3e70047f228728bf039cfacd
+TVHEADEND_VERSION = d6bfd1ffe62e145a6a6e18d00ee722204ee898d4
 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
 TVHEADEND_LICENSE = GPLv3+
 TVHEADEND_LICENSE_FILES = LICENSE.md

This patch does not apply properly on the next branch, since tvheadend was bumped in the mean time. Can you check if it should still be bumped to d6bfd1 ?

I've marked this patch as Changes Requested in patchwork, so please resend if you something to be applied.

Thanks!

Thomas

Signature · 3 lines

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

Thomas Petazzoni

2014-11-26 21:47 UTC #5 lore raw

PATCH 1/3 package/liburiparser: New package

In reply to Bernd Kuhls

Dear Bernd Kuhls,

package/Config.in menu "Networking" · line 832

Quoted 9 lines · Bernd Kuhls

package/Config.in +1 -0

index 796c9f9..6f32b71 100644
@@ -829,6 +829,7 @@ menu "Networking"
 	source "package/libupnpp/Config.in"
 	source "package/libvncserver/Config.in"
 	source "package/libwebsockets/Config.in"
+	source "package/liburiparser/Config.in"

Alphabetic ordering issue.

package/Config.in menu "Networking" · line 833

Quoted 1 line

package/Config.in +1 -0
+ifneq ($(BR2_USE_WCHAR),y)

We prefer positive logic here: ifeq ($(BR2_USE_WCHAR),)

Committed to next with those issues fixed. Thanks!

Thomas

Signature · 3 lines

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