Hello community, here is the log from the commit of package libhdhomerun for openSUSE:Factory checked in at 2015-08-21 07:40:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libhdhomerun (Old) and /work/SRC/openSUSE:Factory/.libhdhomerun.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libhdhomerun" Changes: -------- --- /work/SRC/openSUSE:Factory/libhdhomerun/libhdhomerun.changes 2015-02-10 20:23:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libhdhomerun.new/libhdhomerun.changes 2015-08-21 07:40:52.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Aug 16 14:22:34 UTC 2015 - [email protected] + +- Update to version 20150615 + * update device firmware to 20150615 + +------------------------------------------------------------------- Old: ---- hdhomerun_config_gui_20141210.tgz libhdhomerun_20141210.tgz New: ---- hdhomerun_config_gui_20150615.tgz libhdhomerun_20150615.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libhdhomerun.spec ++++++ --- /var/tmp/diff_new_pack.kfwERj/_old 2015-08-21 07:40:53.000000000 +0200 +++ /var/tmp/diff_new_pack.kfwERj/_new 2015-08-21 07:40:53.000000000 +0200 @@ -23,7 +23,7 @@ BuildRequires: gtk2-devel BuildRequires: pkg-config BuildRequires: update-desktop-files -Version: 20141210 +Version: 20150615 Release: 0 Source0: http://download.silicondust.com/hdhomerun/libhdhomerun_%version.tgz Source1: http://download.silicondust.com/hdhomerun/hdhomerun_config_gui_%version.tgz @@ -142,9 +142,6 @@ cp %{SOURCE2} %buildroot/%{_datadir}/applications %suse_update_desktop_file hdhomerun_config_gui -%clean -rm -rf %buildroot - %post -n libhdhomerun%{SO_NR} -p /sbin/ldconfig %postun -n libhdhomerun%{SO_NR} -p /sbin/ldconfig ++++++ hdhomerun_config_gui_20141210.tgz -> hdhomerun_config_gui_20150615.tgz ++++++ ++++++ libhdhomerun_20141210.tgz -> libhdhomerun_20150615.tgz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libhdhomerun/hdhomerun_channelscan.c new/libhdhomerun/hdhomerun_channelscan.c --- old/libhdhomerun/hdhomerun_channelscan.c 2014-01-16 20:01:59.000000000 +0100 +++ new/libhdhomerun/hdhomerun_channelscan.c 2015-06-03 19:13:14.000000000 +0200 @@ -157,6 +157,13 @@ continue; } + unsigned int original_network_id; + if (sscanf(line, "onid=0x%x", &original_network_id) == 1) { + result->original_network_id = original_network_id; + result->original_network_id_detected = TRUE; + continue; + } + if (program_count >= HDHOMERUN_CHANNELSCAN_MAX_PROGRAM_COUNT) { continue; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libhdhomerun/hdhomerun_config.c new/libhdhomerun/hdhomerun_config.c --- old/libhdhomerun/hdhomerun_config.c 2014-01-16 20:01:59.000000000 +0100 +++ new/libhdhomerun/hdhomerun_config.c 2015-06-03 19:13:14.000000000 +0200 @@ -311,6 +311,9 @@ if (result.transport_stream_id_detected) { cmd_scan_printf(fp, "TSID: 0x%04X\n", result.transport_stream_id); } + if (result.original_network_id_detected) { + cmd_scan_printf(fp, "ONID: 0x%04X\n", result.original_network_id); + } int i; for (i = 0; i < result.program_count; i++) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libhdhomerun/hdhomerun_device.c new/libhdhomerun/hdhomerun_device.c --- old/libhdhomerun/hdhomerun_device.c 2014-07-02 00:40:07.000000000 +0200 +++ new/libhdhomerun/hdhomerun_device.c 2015-05-29 00:42:19.000000000 +0200 @@ -774,16 +774,6 @@ return hdhomerun_control_get(hd->cs, "/ir/target", ptarget, NULL); } -int hdhomerun_device_get_lineup_location(struct hdhomerun_device_t *hd, char **plocation) -{ - if (!hd->cs) { - hdhomerun_debug_printf(hd->dbg, "hdhomerun_device_get_lineup_location: device not set\n"); - return -1; - } - - return hdhomerun_control_get(hd->cs, "/lineup/location", plocation, NULL); -} - int hdhomerun_device_get_version(struct hdhomerun_device_t *hd, char **pversion_str, uint32_t *pversion_num) { if (!hd->cs) { @@ -1012,16 +1002,6 @@ return hdhomerun_control_set(hd->cs, "/ir/target", target, NULL, NULL); } -int hdhomerun_device_set_lineup_location(struct hdhomerun_device_t *hd, const char *location) -{ - if (!hd->cs) { - hdhomerun_debug_printf(hd->dbg, "hdhomerun_device_set_lineup_location: device not set\n"); - return -1; - } - - return hdhomerun_control_set(hd->cs, "/lineup/location", location, NULL, NULL); -} - int hdhomerun_device_set_sys_dvbc_modulation(struct hdhomerun_device_t *hd, const char *modulation_list) { if (!hd->cs) { @@ -1280,6 +1260,22 @@ return channelscan_get_progress(hd->scan); } +const char *hdhomerun_device_get_hw_model_str(struct hdhomerun_device_t *hd) +{ + if (!hd->cs) { + hdhomerun_debug_printf(hd->dbg, "hdhomerun_device_get_hw_model_str: device not set\n"); + return NULL; + } + + char *model_str; + int ret = hdhomerun_control_get(hd->cs, "/sys/hwmodel", &model_str, NULL); + if (ret < 0) { + return NULL; + } + return model_str; +} + + const char *hdhomerun_device_get_model_str(struct hdhomerun_device_t *hd) { if (*hd->model) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libhdhomerun/hdhomerun_device.h new/libhdhomerun/hdhomerun_device.h --- old/libhdhomerun/hdhomerun_device.h 2014-07-02 00:40:07.000000000 +0200 +++ new/libhdhomerun/hdhomerun_device.h 2015-05-29 00:42:19.000000000 +0200 @@ -117,7 +117,6 @@ extern LIBTYPE int hdhomerun_device_get_oob_status(struct hdhomerun_device_t *hd, char **pstatus_str, struct hdhomerun_tuner_status_t *status); extern LIBTYPE int hdhomerun_device_get_oob_plotsample(struct hdhomerun_device_t *hd, struct hdhomerun_plotsample_t **psamples, size_t *pcount); extern LIBTYPE int hdhomerun_device_get_ir_target(struct hdhomerun_device_t *hd, char **ptarget); -extern LIBTYPE int hdhomerun_device_get_lineup_location(struct hdhomerun_device_t *hd, char **plocation); extern LIBTYPE int hdhomerun_device_get_version(struct hdhomerun_device_t *hd, char **pversion_str, uint32_t *pversion_num); extern LIBTYPE int hdhomerun_device_get_supported(struct hdhomerun_device_t *hd, char *prefix, char **pstr); @@ -125,6 +124,7 @@ extern LIBTYPE uint32_t hdhomerun_device_get_tuner_status_snq_color(struct hdhomerun_tuner_status_t *status); extern LIBTYPE uint32_t hdhomerun_device_get_tuner_status_seq_color(struct hdhomerun_tuner_status_t *status); +extern LIBTYPE const char *hdhomerun_device_get_hw_model_str(struct hdhomerun_device_t *hd); extern LIBTYPE const char *hdhomerun_device_get_model_str(struct hdhomerun_device_t *hd); /* @@ -144,7 +144,6 @@ extern LIBTYPE int hdhomerun_device_set_tuner_program(struct hdhomerun_device_t *hd, const char *program); extern LIBTYPE int hdhomerun_device_set_tuner_target(struct hdhomerun_device_t *hd, const char *target); extern LIBTYPE int hdhomerun_device_set_ir_target(struct hdhomerun_device_t *hd, const char *target); -extern LIBTYPE int hdhomerun_device_set_lineup_location(struct hdhomerun_device_t *hd, const char *location); extern LIBTYPE int hdhomerun_device_set_sys_dvbc_modulation(struct hdhomerun_device_t *hd, const char *modulation_list); /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libhdhomerun/hdhomerun_discover.c new/libhdhomerun/hdhomerun_discover.c --- old/libhdhomerun/hdhomerun_discover.c 2014-01-16 20:01:59.000000000 +0100 +++ new/libhdhomerun/hdhomerun_discover.c 2014-12-31 21:24:43.000000000 +0100 @@ -414,9 +414,9 @@ bool_t hdhomerun_discover_validate_device_id(uint32_t device_id) { - static uint32_t lookup_table[16] = {0xA, 0x5, 0xF, 0x6, 0x7, 0xC, 0x1, 0xB, 0x9, 0x2, 0x8, 0xD, 0x4, 0x3, 0xE, 0x0}; + static uint8_t lookup_table[16] = {0xA, 0x5, 0xF, 0x6, 0x7, 0xC, 0x1, 0xB, 0x9, 0x2, 0x8, 0xD, 0x4, 0x3, 0xE, 0x0}; - uint32_t checksum = 0; + uint8_t checksum = 0; checksum ^= lookup_table[(device_id >> 28) & 0x0F]; checksum ^= (device_id >> 24) & 0x0F; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libhdhomerun/hdhomerun_os_posix.c new/libhdhomerun/hdhomerun_os_posix.c --- old/libhdhomerun/hdhomerun_os_posix.c 2014-07-24 01:28:12.000000000 +0200 +++ new/libhdhomerun/hdhomerun_os_posix.c 2015-01-14 07:03:44.000000000 +0100 @@ -21,7 +21,8 @@ #include "hdhomerun_os.h" #if defined(__APPLE__) -#include "mach/clock.h" +#include <mach/clock.h> +#include <mach/mach.h> #endif static pthread_once_t random_get32_once = PTHREAD_ONCE_INIT; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libhdhomerun/hdhomerun_types.h new/libhdhomerun/hdhomerun_types.h --- old/libhdhomerun/hdhomerun_types.h 2014-01-16 20:01:59.000000000 +0100 +++ new/libhdhomerun/hdhomerun_types.h 2015-06-03 19:13:14.000000000 +0200 @@ -69,7 +69,9 @@ int program_count; struct hdhomerun_channelscan_program_t programs[HDHOMERUN_CHANNELSCAN_MAX_PROGRAM_COUNT]; bool_t transport_stream_id_detected; + bool_t original_network_id_detected; uint16_t transport_stream_id; + uint16_t original_network_id; }; struct hdhomerun_plotsample_t {
