Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Julien ROZO (14fef3916816040aa25d6e98eab6c987d3b80cda)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Julien ROZO <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Julien ROZO (14fef3916816040aa25d6e98eab6c987d3b80cda)
  • Date: Fri, 11 Feb 2011 03:47:11 -0600

GIT changes to master grimoire by Julien ROZO <julien AT rozo.org>:

video/zvbi/HISTORY | 3 +++
video/zvbi/PRE_BUILD | 3 +++
video/zvbi/zvbi-ftbfs.patch | 36 ++++++++++++++++++++++++++++++++++++
3 files changed, 42 insertions(+)

New commits:
commit 14fef3916816040aa25d6e98eab6c987d3b80cda
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

zvbi: added patch to fix this compilation issue
undefined reference to 'S_ISCHR'

diff --git a/video/zvbi/HISTORY b/video/zvbi/HISTORY
index 22a9d26..5484979 100644
--- a/video/zvbi/HISTORY
+++ b/video/zvbi/HISTORY
@@ -1,3 +1,6 @@
+2011-02-11 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * PRE_BUILD, zvbi-ftbfs.patch: added, fixing compilation issue
+
2008-10-08 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 0.2.33
* DEPENDS: added doxygen as an optional dependency, to build
diff --git a/video/zvbi/PRE_BUILD b/video/zvbi/PRE_BUILD
new file mode 100755
index 0000000..cc395a4
--- /dev/null
+++ b/video/zvbi/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/zvbi-ftbfs.patch
diff --git a/video/zvbi/zvbi-ftbfs.patch b/video/zvbi/zvbi-ftbfs.patch
new file mode 100644
index 0000000..2825264
--- /dev/null
+++ b/video/zvbi/zvbi-ftbfs.patch
@@ -0,0 +1,36 @@
+Add proper #includes so that we do not get undef errors to S_ISCHR
+during linking.
+
+Signed-off-by: Alex Chiang <achiang AT canonical.com>
+---
+--- zvbi-0.2.33.orig/src/io-dvb.c
++++ zvbi-0.2.33/src/io-dvb.c
+@@ -29,6 +29,8 @@
+ #include <errno.h>
+ #include <sys/select.h>
+ #include <sys/ioctl.h>
++#include <sys/types.h>
++#include <sys/stat.h>
+
+ #ifndef HAVE_S64_U64
+ /* Linux 2.6.x asm/types.h defines __s64 and __u64 only
+--- zvbi-0.2.33.orig/src/io-v4l.c
++++ zvbi-0.2.33/src/io-v4l.c
+@@ -42,6 +42,7 @@ static const char rcsid [] =
+ #include <assert.h>
+ #include <sys/time.h> /* timeval */
+ #include <sys/types.h> /* fd_set, uid_t */
++#include <sys/stat.h> /* S_ISCHR */
+ #include <sys/ioctl.h> /* for (_)videodev.h */
+ #include <pthread.h>
+
+--- zvbi-0.2.33.orig/contrib/ntsc-cc.c
++++ zvbi-0.2.33/contrib/ntsc-cc.c
+@@ -34,6 +34,7 @@
+ #include <locale.h>
+ #include <sys/ioctl.h>
+ #include <sys/types.h>
++#include <sys/stat.h>
+ #include <sys/time.h>
+ #ifdef HAVE_GETOPT_LONG
+ # include <getopt.h>



  • [SM-Commit] GIT changes to master grimoire by Julien ROZO (14fef3916816040aa25d6e98eab6c987d3b80cda), Julien ROZO, 02/11/2011

Archive powered by MHonArc 2.6.24.

Top of Page