aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Bernd Kuhls <bernd.kuhls@t-online.de>2015-08-01 16:34:50 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-08-02 19:20:15 +0200
commit28d8bfecba2e2d9f1647974981665c988c49a51c (patch)
tree7e2e2d614e795aa51621407ac72f9e1edc60642c
parent00e3e44493364c900fdd708d96468f87878596f7 (diff)
downloadbuildroot-28d8bfecba2e2d9f1647974981665c988c49a51c.tar.gz
buildroot-28d8bfecba2e2d9f1647974981665c988c49a51c.tar.bz2
package/tvheadend: Adjust patches after last version bump
Sorry, my repos got mixed up, so I forgot to send the updated patches. Fixes http://autobuild.buildroot.net/results/ddd/ddd196577643de5b4f58a0903b19a04513620693/ http://autobuild.buildroot.net/results/d25/d253c8c9d0773843c462fde0d5005bb14e4ce2c4/ http://autobuild.buildroot.net/results/b61/b61d582c7362332e0ffad645c90d95d880dacedc/ 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>
-rw-r--r--package/tvheadend/0001-no-check_config.patch6
-rw-r--r--package/tvheadend/0002-remove-werror.patch8
2 files changed, 7 insertions, 7 deletions
diff --git a/package/tvheadend/0001-no-check_config.patch b/package/tvheadend/0001-no-check_config.patch
index bc724dbe3f..c77ca76bf0 100644
--- a/package/tvheadend/0001-no-check_config.patch
+++ b/package/tvheadend/0001-no-check_config.patch
@@ -12,12 +12,12 @@ Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
diff -durN tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3.orig/Makefile tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3/Makefile
--- tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3.orig/Makefile 2014-03-09 14:47:43.780025330 +0100
+++ tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3/Makefile 2014-03-09 14:48:40.836539093 +0100
-@@ -294,7 +294,7 @@
+@@ -516,7 +516,7 @@
$(ROOTDIR)/configure $(CONFIGURE_ARGS)
# Binary
--${PROG}: check_config make_webui $(MO-FILES) $(OBJS)
-+${PROG}: make_webui $(MO-FILES) $(OBJS)
+-${PROG}: check_config make_webui $(OBJS)
++${PROG}: make_webui $(OBJS)
$(CC) -o $@ $(OBJS) $(CFLAGS) $(LDFLAGS)
# Object
diff --git a/package/tvheadend/0002-remove-werror.patch b/package/tvheadend/0002-remove-werror.patch
index 624ca3a1d6..d466907ae1 100644
--- a/package/tvheadend/0002-remove-werror.patch
+++ b/package/tvheadend/0002-remove-werror.patch
@@ -5,10 +5,10 @@ Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
diff -durN tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3.orig/Makefile tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3/Makefile
--- tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3.orig/Makefile 2014-03-09 14:50:48.437688482 +0100
+++ tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3/Makefile 2014-03-09 14:54:00.411418749 +0100
-@@ -28,7 +28,7 @@
- #
-
- CFLAGS += -g -O2 -Wunused-result
+@@ -32,7 +32,7 @@
+ ifeq ($(CONFIG_W_UNUSED_RESULT),yes)
+ CFLAGS += -Wunused-result
+ endif
-CFLAGS += -Wall -Werror -Wwrite-strings -Wno-deprecated-declarations
+CFLAGS += -Wall -Wwrite-strings -Wno-deprecated-declarations
CFLAGS += -Wmissing-prototypes