From 3844f943ce8881c9aad9f5e2cedaadbca559f28b Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 31 Dec 2019 00:25:09 +0100 Subject: [PATCH] Revert "disable private copy of the linux dvb headers" This reverts commit 6c5f59db5e11b027f07a3743307c724b56329795. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/bf869b2bb5ca9cfc6bd7ad02e91e1df1b4a34e2b Author: vanhofen Date: 2019-12-31 (Tue, 31 Dec 2019) ------------------ This commit was generated by Migit --- configure.ac | 1 - src/zapit/include/{private => }/linux/dvb/audio.h | 0 src/zapit/include/{private => }/linux/dvb/ca.h | 0 src/zapit/include/{private => }/linux/dvb/dmx.h | 0 src/zapit/include/{private => }/linux/dvb/frontend.h | 0 src/zapit/include/{private => }/linux/dvb/net.h | 0 src/zapit/include/{private => }/linux/dvb/osd.h | 0 src/zapit/include/{private => }/linux/dvb/version.h | 0 src/zapit/include/{private => }/linux/dvb/video.h | 0 9 files changed, 1 deletion(-) rename src/zapit/include/{private => }/linux/dvb/audio.h (100%) rename src/zapit/include/{private => }/linux/dvb/ca.h (100%) rename src/zapit/include/{private => }/linux/dvb/dmx.h (100%) rename src/zapit/include/{private => }/linux/dvb/frontend.h (100%) rename src/zapit/include/{private => }/linux/dvb/net.h (100%) rename src/zapit/include/{private => }/linux/dvb/osd.h (100%) rename src/zapit/include/{private => }/linux/dvb/version.h (100%) rename src/zapit/include/{private => }/linux/dvb/video.h (100%) diff --git a/configure.ac b/configure.ac index 10c54ff9f..87a108959 100644 --- a/configure.ac +++ b/configure.ac @@ -295,7 +295,6 @@ if test "$BOXTYPE" = "coolstream"; then HWLIB_CFLAGS='-I$(top_srcdir)/lib/hardware/coolstream/hd2/libcoolstream' fi - HWLIB_CFLAGS="$HWLIB_CFLAGS "'-I$(top_srcdir)/src/zapit/include/private' HWLIB_CFLAGS="$HWLIB_CFLAGS "'-I$(top_srcdir)/lib/hardware/coolstream' fi diff --git a/src/zapit/include/private/linux/dvb/audio.h b/src/zapit/include/linux/dvb/audio.h similarity index 100% rename from src/zapit/include/private/linux/dvb/audio.h rename to src/zapit/include/linux/dvb/audio.h diff --git a/src/zapit/include/private/linux/dvb/ca.h b/src/zapit/include/linux/dvb/ca.h similarity index 100% rename from src/zapit/include/private/linux/dvb/ca.h rename to src/zapit/include/linux/dvb/ca.h diff --git a/src/zapit/include/private/linux/dvb/dmx.h b/src/zapit/include/linux/dvb/dmx.h similarity index 100% rename from src/zapit/include/private/linux/dvb/dmx.h rename to src/zapit/include/linux/dvb/dmx.h diff --git a/src/zapit/include/private/linux/dvb/frontend.h b/src/zapit/include/linux/dvb/frontend.h similarity index 100% rename from src/zapit/include/private/linux/dvb/frontend.h rename to src/zapit/include/linux/dvb/frontend.h diff --git a/src/zapit/include/private/linux/dvb/net.h b/src/zapit/include/linux/dvb/net.h similarity index 100% rename from src/zapit/include/private/linux/dvb/net.h rename to src/zapit/include/linux/dvb/net.h diff --git a/src/zapit/include/private/linux/dvb/osd.h b/src/zapit/include/linux/dvb/osd.h similarity index 100% rename from src/zapit/include/private/linux/dvb/osd.h rename to src/zapit/include/linux/dvb/osd.h diff --git a/src/zapit/include/private/linux/dvb/version.h b/src/zapit/include/linux/dvb/version.h similarity index 100% rename from src/zapit/include/private/linux/dvb/version.h rename to src/zapit/include/linux/dvb/version.h diff --git a/src/zapit/include/private/linux/dvb/video.h b/src/zapit/include/linux/dvb/video.h similarity index 100% rename from src/zapit/include/private/linux/dvb/video.h rename to src/zapit/include/linux/dvb/video.h