Revert to building with internal hdhomerun forkscratch/internal-hdhomerun

4 files changed, 6 insertions, 319 deletions

diff --git a/xbmc-12.2-hdhomerun.patch b/xbmc-12.2-hdhomerun.patch
deleted file mode 100644
index 73cad40..0000000
--- a/xbmc-12.2-hdhomerun.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-commit ef5c269992b32d67de7547e9f530b6c971381f45
-Author: Ken Dreyer <ktdreyer@ktdreyer.com>
-Date:   Fri Aug 24 19:34:47 2012 -0600
-
-    Fedora: use external hdhomerun
-    
-    Original patch by Alex Lancaster <alexlan[AT]fedoraproject org>
-
-diff --git a/Makefile.in b/Makefile.in
-index 39dc6f9..79877b4 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -179,7 +179,6 @@ endif
- LIB_DIRS=\
- 	lib/cximage-6.0 \
- 	lib/libexif \
--	lib/libhdhomerun \
- 	lib/cpluff \
- 	lib/xbmc-dll-symbols
- 
-@@ -352,8 +351,6 @@ libexif: dllloader
- 	$(MAKE) -C lib/libexif
- cmyth: dllloader
- 	$(MAKE) -C lib/cmyth
--libhdhomerun: dllloader
--	$(MAKE) -C lib/libhdhomerun
- papcodecs: dllloader dvdpcodecs
- 	test -d system/players/paplayer || mkdir system/players/paplayer
- 	$(MAKE) -C lib/xbadpcm
-@@ -382,7 +379,7 @@ endif
- 
- codecs: papcodecs dvdpcodecs
- 
--libs: libhdhomerun imagelib libexif system/libcpluff-@ARCH@.so $(CMYTH)
-+libs: imagelib libexif system/libcpluff-@ARCH@.so $(CMYTH)
- 
- externals: codecs libs visualizations screensavers libaddon pvraddons
- 
-diff --git a/configure.in b/configure.in
-index e922043..b61f0dd 100644
---- a/configure.in
-+++ b/configure.in
-@@ -2331,7 +2331,6 @@ OUTPUT_FILES="Makefile \
-     lib/libexif/Makefile \
-     lib/libXDAAP/Makefile \
-     lib/cmyth/Makefile \
--    lib/libhdhomerun/Makefile \
-     lib/libsquish/Makefile \
-     lib/cximage-6.0/Makefile \
-     lib/addons/script.module.pil/Makefile \
-diff --git a/xbmc/filesystem/DllHDHomeRun.h b/xbmc/filesystem/DllHDHomeRun.h
-index 1667fde..48bdae3 100644
---- a/xbmc/filesystem/DllHDHomeRun.h
-+++ b/xbmc/filesystem/DllHDHomeRun.h
-@@ -20,7 +20,7 @@
-  */
- 
- #include "DynamicDll.h"
--#include "lib/libhdhomerun/hdhomerun.h"
-+#include <hdhomerun/hdhomerun.h>
- 
- class DllHdHomeRunInterface
- {
-@@ -41,30 +41,56 @@ public:
- 
- class DllHdHomeRun : public DllDynamic, public DllHdHomeRunInterface
- {
--  DECLARE_DLL_WRAPPER(DllHdHomeRun, DLL_PATH_LIBHDHOMERUN)
--  DEFINE_METHOD5(int, discover_find_devices_custom, (uint32_t p1, uint32_t p2, uint32_t p3, struct hdhomerun_discover_device_t p4[], int p5))
--  DEFINE_METHOD2(struct hdhomerun_device_t*, device_create_from_str, (const char* p1, struct hdhomerun_debug_t *p2))
--  DEFINE_METHOD1(void, device_destroy, (struct hdhomerun_device_t* p1))
--  DEFINE_METHOD1(int, device_stream_start, (struct hdhomerun_device_t* p1))
--  DEFINE_METHOD3(uint8_t*, device_stream_recv, (struct hdhomerun_device_t* p1, size_t p2, size_t* p3))
--  DEFINE_METHOD1(void, device_stream_stop, (struct hdhomerun_device_t* p1))
--  DEFINE_METHOD2(int, device_set_tuner_channel, (struct hdhomerun_device_t *p1, const char *p2))
--  DEFINE_METHOD2(int, device_set_tuner_program, (struct hdhomerun_device_t *p1, const char *p2))
--  DEFINE_METHOD2(int, device_set_tuner_from_str, (struct hdhomerun_device_t *p1, const char *p2))
--  DEFINE_METHOD2(void, device_set_tuner, (struct hdhomerun_device_t *p1, unsigned int p2))
--  DEFINE_METHOD3(int, device_get_tuner_status, (struct hdhomerun_device_t *p1, char **p2, struct hdhomerun_tuner_status_t *p3));
--  BEGIN_METHOD_RESOLVE()
--    RESOLVE_METHOD_RENAME(hdhomerun_discover_find_devices_custom, discover_find_devices_custom)
--    RESOLVE_METHOD_RENAME(hdhomerun_device_create_from_str, device_create_from_str)
--    RESOLVE_METHOD_RENAME(hdhomerun_device_destroy, device_destroy)
--    RESOLVE_METHOD_RENAME(hdhomerun_device_stream_start, device_stream_start)
--    RESOLVE_METHOD_RENAME(hdhomerun_device_stream_recv, device_stream_recv)
--    RESOLVE_METHOD_RENAME(hdhomerun_device_stream_stop, device_stream_stop)
--    RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner_channel, device_set_tuner_channel)
--    RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner_program, device_set_tuner_program)
--    RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner_from_str, device_set_tuner_from_str)
--    RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner, device_set_tuner)
--    RESOLVE_METHOD_RENAME(hdhomerun_device_get_tuner_status, device_get_tuner_status)
--  END_METHOD_RESOLVE()
-+public:
-+  virtual ~DllHdHomeRun () {};
-+
-+  virtual int discover_find_devices_custom (uint32_t p1, uint32_t p2, uint32_t p3, struct hdhomerun_discover_device_t p4[], int p5)
-+      { return ::hdhomerun_discover_find_devices_custom (p1, p2, p3, p4, p5); }
-+
-+  virtual struct hdhomerun_device_t *device_create_from_str (const char* p1, struct hdhomerun_debug_t *p2)
-+      { return ::hdhomerun_device_create_from_str (p1, p2); }
-+
-+  virtual void device_destroy (struct hdhomerun_device_t* p1)
-+      { ::hdhomerun_device_destroy (p1); }
-+
-+  virtual int device_stream_start (struct hdhomerun_device_t* p1)
-+      { return ::hdhomerun_device_stream_start (p1); }
-+
-+
-+  virtual uint8_t *device_stream_recv (struct hdhomerun_device_t* p1, size_t p2, size_t* p3)
-+      { 
-+        uint8_t *retval;
-+
-+        size_t tmp = *p3;
-+        retval = ::hdhomerun_device_stream_recv (p1, p2, &tmp);
-+        *p3 = tmp;
-+
-+        return retval;
-+      }
-+
-+  virtual void device_stream_stop (struct hdhomerun_device_t* p1)
-+      { ::hdhomerun_device_stream_stop (p1); }
-+
-+  virtual int device_set_tuner_channel (struct hdhomerun_device_t *p1, const char *p2)
-+      { return ::hdhomerun_device_set_tuner_channel (p1, p2); }
-+
-+  virtual int device_set_tuner_program (struct hdhomerun_device_t *p1, const char *p2)
-+      { return ::hdhomerun_device_set_tuner_program (p1, p2); }
-+
-+
-+  virtual int device_set_tuner_from_str (struct hdhomerun_device_t *p1, const char *p2)
-+      { return ::hdhomerun_device_set_tuner_from_str (p1, p2); }
-+
-+
-+  virtual void device_set_tuner (struct hdhomerun_device_t *p1, unsigned int p2)
-+      { ::hdhomerun_device_set_tuner (p1, p2); }
-+
-+  virtual int device_get_tuner_status (struct hdhomerun_device_t *p1, char **p2, struct hdhomerun_tuner_status_t *p3)
-+      { return ::hdhomerun_device_get_tuner_status (p1, p2, p3); }
-+
-+  // DLL faking.
-+  virtual bool ResolveExports() { return true; }
-+  virtual bool Load() { return true; }
-+  virtual void Unload() {}
- };
- 
diff --git a/xbmc-generate-tarball-xz.sh b/xbmc-generate-tarball-xz.sh
index 60fff3e..7145b73 100755
--- a/xbmc-generate-tarball-xz.sh
+++ b/xbmc-generate-tarball-xz.sh
@@ -27,7 +27,7 @@ pushd xbmc-$VERSION
 # grrr, *still* have to keep in ffmpeg for now (2011-12-28) since upstream
 # seems to require files within that subdirectory <sigh>, filed
 # http://trac.xbmc.org/ticket/12370
-for i in  cximage-6.0/zlib libid3tag/zlib libhdhomerun libmpeg2 ffmpeg
+for i in  cximage-6.0/zlib libid3tag/zlib libmpeg2 ffmpeg
 do
     rm -r lib/$i
 done
diff --git a/xbmc-master-hdhomerun.patch b/xbmc-master-hdhomerun.patch
deleted file mode 100644
index a5a797c..0000000
--- a/xbmc-master-hdhomerun.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-commit 2f7bbc5de48fbd105fabbd79aae270cbcb3ade03
-Author: Ken Dreyer <ktdreyer@ktdreyer.com>
-Date:   Fri Aug 24 19:34:47 2012 -0600
-
-    Fedora: use external hdhomerun
-    
-    Original patch by Alex Lancaster <alexlan[AT]fedoraproject org>
-    (cherry picked from commit ef5c269992b32d67de7547e9f530b6c971381f45)
-
-diff --git a/Makefile.in b/Makefile.in
-index 3cbe1a2..5d6aaf7 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -186,7 +186,6 @@ endif
- LIB_DIRS=\
- 	lib/cximage-6.0 \
- 	lib/libexif \
--	lib/libhdhomerun \
- 	lib/cpluff \
- 	lib/xbmc-dll-symbols
- 
-@@ -363,8 +362,6 @@ libexif: dllloader
- 	$(MAKE) -C lib/libexif
- cmyth: dllloader
- 	$(MAKE) -C lib/cmyth
--libhdhomerun: dllloader
--	$(MAKE) -C lib/libhdhomerun
- papcodecs: dllloader dvdpcodecs
- 	test -d system/players/paplayer || mkdir system/players/paplayer
- 	$(MAKE) -C lib/xbadpcm
-@@ -393,7 +390,7 @@ endif
- 
- codecs: papcodecs dvdpcodecs
- 
--libs: libhdhomerun imagelib libexif system/libcpluff-@ARCH@.so $(CMYTH)
-+libs: imagelib libexif system/libcpluff-@ARCH@.so $(CMYTH)
- 
- externals: codecs libs visualizations screensavers libaddon pvraddons
- 
-diff --git a/configure.in b/configure.in
-index 04dac86..38d7698 100644
---- a/configure.in
-+++ b/configure.in
-@@ -2399,7 +2399,6 @@ OUTPUT_FILES="Makefile \
-     lib/libexif/Makefile \
-     lib/libXDAAP/Makefile \
-     lib/cmyth/Makefile \
--    lib/libhdhomerun/Makefile \
-     lib/libsquish/Makefile \
-     lib/cximage-6.0/Makefile \
-     lib/libUPnP/Makefile \
-diff --git a/xbmc/filesystem/DllHDHomeRun.h b/xbmc/filesystem/DllHDHomeRun.h
-index e49ff31..41b4591 100644
---- a/xbmc/filesystem/DllHDHomeRun.h
-+++ b/xbmc/filesystem/DllHDHomeRun.h
-@@ -20,7 +20,7 @@
-  */
- 
- #include "DynamicDll.h"
--#include "lib/libhdhomerun/hdhomerun.h"
-+#include <hdhomerun/hdhomerun.h>
- 
- class DllHdHomeRunInterface
- {
-@@ -41,30 +41,56 @@ public:
- 
- class DllHdHomeRun : public DllDynamic, public DllHdHomeRunInterface
- {
--  DECLARE_DLL_WRAPPER(DllHdHomeRun, DLL_PATH_LIBHDHOMERUN)
--  DEFINE_METHOD5(int, discover_find_devices_custom, (uint32_t p1, uint32_t p2, uint32_t p3, struct hdhomerun_discover_device_t p4[], int p5))
--  DEFINE_METHOD2(struct hdhomerun_device_t*, device_create_from_str, (const char* p1, struct hdhomerun_debug_t *p2))
--  DEFINE_METHOD1(void, device_destroy, (struct hdhomerun_device_t* p1))
--  DEFINE_METHOD1(int, device_stream_start, (struct hdhomerun_device_t* p1))
--  DEFINE_METHOD3(uint8_t*, device_stream_recv, (struct hdhomerun_device_t* p1, size_t p2, size_t* p3))
--  DEFINE_METHOD1(void, device_stream_stop, (struct hdhomerun_device_t* p1))
--  DEFINE_METHOD2(int, device_set_tuner_channel, (struct hdhomerun_device_t *p1, const char *p2))
--  DEFINE_METHOD2(int, device_set_tuner_program, (struct hdhomerun_device_t *p1, const char *p2))
--  DEFINE_METHOD2(int, device_set_tuner_from_str, (struct hdhomerun_device_t *p1, const char *p2))
--  DEFINE_METHOD2(void, device_set_tuner, (struct hdhomerun_device_t *p1, unsigned int p2))
--  DEFINE_METHOD3(int, device_get_tuner_status, (struct hdhomerun_device_t *p1, char **p2, struct hdhomerun_tuner_status_t *p3));
--  BEGIN_METHOD_RESOLVE()
--    RESOLVE_METHOD_RENAME(hdhomerun_discover_find_devices_custom, discover_find_devices_custom)
--    RESOLVE_METHOD_RENAME(hdhomerun_device_create_from_str, device_create_from_str)
--    RESOLVE_METHOD_RENAME(hdhomerun_device_destroy, device_destroy)
--    RESOLVE_METHOD_RENAME(hdhomerun_device_stream_start, device_stream_start)
--    RESOLVE_METHOD_RENAME(hdhomerun_device_stream_recv, device_stream_recv)
--    RESOLVE_METHOD_RENAME(hdhomerun_device_stream_stop, device_stream_stop)
--    RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner_channel, device_set_tuner_channel)
--    RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner_program, device_set_tuner_program)
--    RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner_from_str, device_set_tuner_from_str)
--    RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner, device_set_tuner)
--    RESOLVE_METHOD_RENAME(hdhomerun_device_get_tuner_status, device_get_tuner_status)
--  END_METHOD_RESOLVE()
-+public:
-+  virtual ~DllHdHomeRun () {};
-+
-+  virtual int discover_find_devices_custom (uint32_t p1, uint32_t p2, uint32_t p3, struct hdhomerun_discover_device_t p4[], int p5)
-+      { return ::hdhomerun_discover_find_devices_custom (p1, p2, p3, p4, p5); }
-+
-+  virtual struct hdhomerun_device_t *device_create_from_str (const char* p1, struct hdhomerun_debug_t *p2)
-+      { return ::hdhomerun_device_create_from_str (p1, p2); }
-+
-+  virtual void device_destroy (struct hdhomerun_device_t* p1)
-+      { ::hdhomerun_device_destroy (p1); }
-+
-+  virtual int device_stream_start (struct hdhomerun_device_t* p1)
-+      { return ::hdhomerun_device_stream_start (p1); }
-+
-+
-+  virtual uint8_t *device_stream_recv (struct hdhomerun_device_t* p1, size_t p2, size_t* p3)
-+      { 
-+        uint8_t *retval;
-+
-+        size_t tmp = *p3;
-+        retval = ::hdhomerun_device_stream_recv (p1, p2, &tmp);
-+        *p3 = tmp;
-+
-+        return retval;
-+      }
-+
-+  virtual void device_stream_stop (struct hdhomerun_device_t* p1)
-+      { ::hdhomerun_device_stream_stop (p1); }
-+
-+  virtual int device_set_tuner_channel (struct hdhomerun_device_t *p1, const char *p2)
-+      { return ::hdhomerun_device_set_tuner_channel (p1, p2); }
-+
-+  virtual int device_set_tuner_program (struct hdhomerun_device_t *p1, const char *p2)
-+      { return ::hdhomerun_device_set_tuner_program (p1, p2); }
-+
-+
-+  virtual int device_set_tuner_from_str (struct hdhomerun_device_t *p1, const char *p2)
-+      { return ::hdhomerun_device_set_tuner_from_str (p1, p2); }
-+
-+
-+  virtual void device_set_tuner (struct hdhomerun_device_t *p1, unsigned int p2)
-+      { ::hdhomerun_device_set_tuner (p1, p2); }
-+
-+  virtual int device_get_tuner_status (struct hdhomerun_device_t *p1, char **p2, struct hdhomerun_tuner_status_t *p3)
-+      { return ::hdhomerun_device_get_tuner_status (p1, p2, p3); }
-+
-+  // DLL faking.
-+  virtual bool ResolveExports() { return true; }
-+  virtual bool Load() { return true; }
-+  virtual void Unload() {}
- };
- 
diff --git a/xbmc.spec b/xbmc.spec
index 1531500..6b366ed 100644
--- a/xbmc.spec
+++ b/xbmc.spec
@@ -5,7 +5,7 @@
 
 Name: xbmc
 Version: 12.2
-Release: 1%{?dist}
+Release: 1.1%{?dist}
 URL: http://www.xbmc.org/
 
 Source0: %{name}-%{DIRVERSION}-patched.tar.xz
@@ -33,14 +33,9 @@ Patch1: xbmc-12.0-pvraddons-with-dependencies.patch
 # http://trac.xbmc.org/ticket/9658
 Patch2: xbmc-12.2-dvdread.patch
 
-# need to file trac ticket, this patch just forces external hdhomerun
-# functionality, needs to be able fallback internal version
-Patch3: xbmc-12.2-hdhomerun.patch
-
 
 # Optional deps (not in EPEL)
 # (libbluray in EPEL 6 is too old.)
-%{?fedora:%global _with_hdhomerun 1}
 %ifarch x86_64 i686
 %{?fedora:%global _with_crystalhd 1}
 %endif
@@ -121,9 +116,6 @@ BuildRequires: faad2-devel
 BuildRequires: pulseaudio-libs-devel
 BuildRequires: libdca-devel
 BuildRequires: libass-devel >= 0.9.7
-%if 0%{?_with_hdhomerun}
-BuildRequires: hdhomerun-devel
-%endif
 %if 0%{?_with_crystalhd}
 BuildRequires: libcrystalhd-devel
 %endif
@@ -171,9 +163,6 @@ BuildRequires: libva-devel
 # as they are dynamically loaded via XBMC's arcane 
 # pseudo-DLL loading scheme (sigh)
 Requires: librtmp
-%if 0%{?_with_hdhomerun}
-BuildRequires: hdhomerun
-%endif
 %if 0%{?_with_crystalhd}
 Requires: libcrystalhd
 %endif
@@ -221,20 +210,6 @@ forecast functions, together third-party plugins.
 
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-
-%if 0%{?_with_hdhomerun}
-%else
-  # Remove hdhomerun from the build.
-  pushd xbmc/filesystem/
-    rm HDHomeRunFile.cpp HDHomeRunFile.h
-    rm HDHomeRunDirectory.cpp HDHomeRunDirectory.h
-    sed -i Makefile.in -e '/HDHomeRunFile\.cpp/d'
-    sed -i Makefile.in -e '/HDHomeRunDirectory\.cpp/d'
-    sed -i DirectoryFactory.cpp -e '/HomeRun/d'
-    sed -i FileFactory.cpp -e '/HomeRun/d'
-  popd
-%endif
 
 %build
 
@@ -260,7 +235,7 @@ CPPFLAGS="-I/usr/include/ffmpeg" \
 CFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/afpfs-ng/ -I/usr/include/ffmpeg -I/usr/include/samba-4.0/ -D__STDC_CONSTANT_MACROS" \
 CXXFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/afpfs-ng/ -I/usr/include/ffmpeg -I/usr/include/samba-4.0/ -D__STDC_CONSTANT_MACROS" \
 LDFLAGS="-fPIC" \
-LIBS="-L%{_libdir}/mysql %{?_with_hdhomerun:-lhdhomerun} $LIBS" \
+LIBS="-L%{_libdir}/mysql $LIBS" \
 ASFLAGS=-fPIC
 
 make %{?_smp_mflags} VERBOSE=1
@@ -327,6 +302,9 @@ fi
 #%%{_includedir}/xbmc/xbmcclient.h
 
 %changelog
+* Fri May 17 2013 Ken Dreyer <ktdreyer@ktdreyer.com> - 12.2-1.1
+- Revert to building with internal hdhomerun fork
+
 * Mon May 06 2013 Ken Dreyer <ktdreyer@ktdreyer.com> - 12.2-1
 - Update to Frodo 12.2
 - Rebase hdhomerun and dvdread patches onto 12.2