Heya,
In addition to the arte and BBC patches I posted to trac, here are a few
more bugs fixes.
quvi-tool:
0001-Check-for-and-use-gengetopt.patch
libquvi-scripts:
0001-Fix-build-with-NSFW-and-FIXME-scripts-enabled.patch
Cheers
>From 41c2859303ddf2e64b231c5d71fe94a22a5426d8 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <[email protected]>
Date: Sat, 21 Jul 2012 18:31:56 +0100
Subject: [PATCH] Check for and use gengetopt
Otherwise it takes ages to figure out how to build quvi-tool from git.
---
configure.ac | 5 +++++
src/quvi/Makefile.am | 5 +++++
2 files changed, 10 insertions(+)
diff --git a/configure.ac b/configure.ac
index 304fdb9..84ed49e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,6 +26,11 @@ AM_SILENT_RULES([yes])
# Checks for programs.
AC_PROG_CC
+AC_PATH_PROG([GENGETOPT],[gengetopt])
+if test x$GENGETOPT = x; then
+ AC_MSG_ERROR([gengetopt is necessary to build quvi-tool])
+fi
+
# Checks for libraries.
PKG_CHECK_MODULES([libquvi], [libquvi >= 0.4.0])
PKG_CHECK_MODULES([libcurl], [libcurl >= 7.18.2])
diff --git a/src/quvi/Makefile.am b/src/quvi/Makefile.am
index 7fa7318..0e6d550 100644
--- a/src/quvi/Makefile.am
+++ b/src/quvi/Makefile.am
@@ -12,6 +12,11 @@ endif
bin_PROGRAMS= quvi
quvi_SOURCES= $(src) $(hdr)
+cmdline.h: cmdline.c
+
+cmdline.c: Makefile cmdline.ggo
+ $(AM_V_GEN) $(GENGETOPT) -i $(srcdir)/cmdline.ggo --no-version --unamed-opts -C --output-dir=$(builddir)
+
quvi_CPPFLAGS=\
$(libquvi_CFLAGS) \
$(libcurl_CFLAGS) \
--
1.7.10.4
>From ea81bd77c80af78e908ab85d41557e93cc9d2036 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <[email protected]>
Date: Sat, 21 Jul 2012 18:41:25 +0100
Subject: [PATCH] Fix build with NSFW and FIXME scripts enabled
A missing backslash was causing a broken Makefile to be generated.
---
share/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/share/Makefile.am b/share/Makefile.am
index d4c5dfd..87a6729 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -70,7 +70,7 @@ DIST_lua+=\
lua/website/pluzz.lua \
lua/website/vimeo.lua
if WITH_NSFW
-DIST_lua+=
+DIST_lua+= \
lua/website/tube8.lua \
lua/website/keezmovies.lua
endif
--
1.7.10.4
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
quvi-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/quvi-devel
