aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab+samsung@kernel.org>2019-08-12 10:22:22 -0300
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2019-08-12 10:22:22 -0300
commit11e258342bda5ebf23e78dae05385185a750a2bf (patch)
tree3ff5aefdff2f425d7b4fa8c4fe6177877b6c8d94
parentdc6be1b9518fee1866526db326e0d0fde65e80b2 (diff)
Make it build again
This project is too old and had several broken things when building with modern distros. Make it build again. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
-rw-r--r--Makefile.in6
-rw-r--r--config.h.in3
-rw-r--r--configure.ac5
-rw-r--r--console/ttv.c1
-rw-r--r--debug/sysfs.c1
-rw-r--r--gtk/blit.c1
-rw-r--r--libng/grab-ng.c1
-rw-r--r--libng/plugins/deinterlace.c6
-rw-r--r--libng/plugins/read-qt.c6
-rw-r--r--libng/plugins/write-qt.c6
-rw-r--r--structs/struct-dvb.c12
11 files changed, 29 insertions, 19 deletions
diff --git a/Makefile.in b/Makefile.in
index 073df10..3816e5d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -41,14 +41,14 @@ WARN_FLAGS += -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
WARN_FLAGS += $(call cc-option, -Wno-pointer-sign)
LFS_FLAGS := -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-X11_FLAGS := @X_CFLAGS@ @XFT_FLAGS@ -I/usr/X11R6/include/X11/fonts
+X11_FLAGS := @X_CFLAGS@ @XFT_FLAGS@ -I/usr/X11R6/include/X11/fonts @QT_FLAGS@
LIB_FLAGS := -I. -I./vbistuff -I./x11 \
-I$(srcdir)/jwz -I$(srcdir)/common -I$(srcdir)/console \
-I$(srcdir)/x11 -I$(srcdir)/structs \
-I$(srcdir)/libng -Llibng
# X11 stuff
-X11_LIBS := @X_LIBS@ @XFT_LIBS@ @LIBS@
+X11_LIBS := @X_LIBS@ @XFT_LIBS@ @LIBS@ -lX11 -lXext
ATHENA_LIBS := $(X11_LIBS) @ATHENA@
MOTIF_LIBS := $(X11_LIBS) -lXm -lXmu -lXt @X_PRE_LIBS@ \
-lXp -lXpm -lXext -lX11 @X_EXTRA_LIBS@
@@ -56,7 +56,7 @@ MOTIF_LIBS := $(X11_LIBS) -lXm -lXmu -lXt @X_PRE_LIBS@ \
# gtk2 stuff
GTK_CFLAGS := @GTK_CFLAGS@
GTK_CFLAGS += -Wno-strict-prototypes # fsck gtk+ header files
-GTK_LIBS := @GTK_LIBS@ @X_LIBS@ @XFT_LIBS@ @LIBS@
+GTK_LIBS := @GTK_LIBS@ $(X11_LIBS)
# various libraries
THREAD_LIBS := @LIBPTHREAD@
diff --git a/config.h.in b/config.h.in
index 05bcccd..ec1a123 100644
--- a/config.h.in
+++ b/config.h.in
@@ -144,6 +144,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
diff --git a/configure.ac b/configure.ac
index 20f43b5..4b6f82c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -312,8 +312,13 @@ fi
QTLIBS=""
if test "$FOUND_LQT" = "yes"; then
QTLIBS="-lquicktime $quicktime_libs"
+ QT_FLAGS="`pkg-config libquicktime --cflags-only-I`"
+ if test "$QT_FLAGS" = ""; then
+ QT_FLAGS= "-I/usr/include/quicktime"
+ fi
fi
AC_SUBST(QTLIBS)
+AC_SUBST(QT_FLAGS)
if test "$enable_xfree_ext" != "no"; then
AC_CHECK_LIB(Xdpms, DPMSQueryExtension,,,
diff --git a/console/ttv.c b/console/ttv.c
index 9e9883a..2e229f3 100644
--- a/console/ttv.c
+++ b/console/ttv.c
@@ -9,7 +9,6 @@
#include "grab-ng.h"
#include "capture.h"
-#include "channel.h"
#include "commands.h"
#include "frequencies.h"
#include "parseconfig.h"
diff --git a/debug/sysfs.c b/debug/sysfs.c
index 9cfcced..30a847a 100644
--- a/debug/sysfs.c
+++ b/debug/sysfs.c
@@ -12,6 +12,7 @@
#include <fcntl.h>
#include <dirent.h>
#include <sys/stat.h>
+#include <sys/sysmacros.h>
/* ------------------------------------------------------------------------ */
diff --git a/gtk/blit.c b/gtk/blit.c
index a78a930..2749fd2 100644
--- a/gtk/blit.c
+++ b/gtk/blit.c
@@ -5,6 +5,7 @@
#include "config.h"
+#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/libng/grab-ng.c b/libng/grab-ng.c
index c52c8d4..df6029e 100644
--- a/libng/grab-ng.c
+++ b/libng/grab-ng.c
@@ -19,6 +19,7 @@
#include <ctype.h>
#include <inttypes.h>
#include <fcntl.h>
+#include <sys/sysmacros.h>
#include <sys/time.h>
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/libng/plugins/deinterlace.c b/libng/plugins/deinterlace.c
index 76866bd..e9786a8 100644
--- a/libng/plugins/deinterlace.c
+++ b/libng/plugins/deinterlace.c
@@ -109,9 +109,9 @@ static inline void linearBlend(unsigned char *src, int stride)
static inline void linear_blend_line(unsigned char *dst, unsigned char *src,
int bpl)
{
- unsigned char restrict *srcp = src - bpl;
- unsigned char restrict *srch = src;
- unsigned char restrict *srcn = src + bpl;
+ unsigned char *srcp = src - bpl;
+ unsigned char *srch = src;
+ unsigned char *srcn = src + bpl;
int val,x = bpl;
while (x--) {
diff --git a/libng/plugins/read-qt.c b/libng/plugins/read-qt.c
index f79ed2b..8c4e21f 100644
--- a/libng/plugins/read-qt.c
+++ b/libng/plugins/read-qt.c
@@ -4,9 +4,9 @@
#include <stdio.h>
#include <string.h>
#include <pthread.h>
-#include <quicktime/quicktime.h>
-#include <quicktime/colormodels.h>
-#include <quicktime/lqt.h>
+#include <quicktime.h>
+#include <colormodels.h>
+#include <lqt.h>
#include "grab-ng.h"
diff --git a/libng/plugins/write-qt.c b/libng/plugins/write-qt.c
index 95e7c2f..0cd34dc 100644
--- a/libng/plugins/write-qt.c
+++ b/libng/plugins/write-qt.c
@@ -4,9 +4,9 @@
#include <stdio.h>
#include <string.h>
#include <pthread.h>
-#include <quicktime/quicktime.h>
-#include <quicktime/colormodels.h>
-#include <quicktime/lqt.h>
+#include <quicktime.h>
+#include <colormodels.h>
+#include <lqt.h>
#include "grab-ng.h"
diff --git a/structs/struct-dvb.c b/structs/struct-dvb.c
index cf0387a..0c6fbda 100644
--- a/structs/struct-dvb.c
+++ b/structs/struct-dvb.c
@@ -346,12 +346,12 @@ struct ioctl_desc ioctls_dvb[256] = {
[_IOC_NR(DMX_GET_PES_PIDS)] = {
.name = "DMX_GET_PES_PIDS",
},
- [_IOC_NR(DMX_GET_CAPS)] = {
- .name = "DMX_GET_CAPS",
- },
- [_IOC_NR(DMX_SET_SOURCE)] = {
- .name = "DMX_SET_SOURCE",
- },
+// [_IOC_NR(DMX_GET_CAPS)] = {
+// .name = "DMX_GET_CAPS",
+// },
+// [_IOC_NR(DMX_SET_SOURCE)] = {
+// .name = "DMX_SET_SOURCE",
+// },
[_IOC_NR(DMX_GET_STC)] = {
.name = "DMX_GET_STC",
},

Privacy Policy