Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@djp952
djp952 committed Apr 7, 2024
1 parent f7f77ed commit 6fd3715
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 102 deletions.
5 changes: 2 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Unofficial Kodi HDHomeRun DVR PVR Client
## [__USER DOCUMENTATION AND DOWNLOADS__](https://github.com/djp952/pvr.hdhomerundvr/wiki)

Copyright (C)2016-2022 Michael G. Brehm
Copyright (C)2016-2024 Michael G. Brehm
[MIT LICENSE](https://opensource.org/licenses/MIT)

[__CURL__](https://curl.haxx.se/) - Copyright (C)1996-2022, Daniel Stenberg, [email protected], and many contributors
Expand Down Expand Up @@ -83,7 +83,7 @@ sudo cp -v $(pwd)/osxcross/build/compiler-rt/compiler-rt/build/lib/darwin/*.dyli
**INITIALIZE SOURCE TREE AND DEPENDENCIES**
* Open "Developer Command Prompt for VS2022"
```
git clone https://github.com/djp952/pvr.hdhomerundvr -b Nexus
git clone https://github.com/djp952/pvr.hdhomerundvr -b Omega
cd pvr.hdhomerundvr
git submodule update --init
```
Expand Down Expand Up @@ -130,7 +130,6 @@ Examples:
| uwp-arm | Universal Windows Platform ARM | /t:uwp-arm |
| uwp-win32 | Universal Windows Platform X86 | /t:uwp-win32 |
| uwp-x64 | Universal Windows Platform X64 | /t:uwp-x64 |
| uwpappx-arm | Universal Windows Platform ARM MSIX | /t:uwpappx-arm /p:Keystore={keystore};KeystorePassword={keystore-password} |
| uwpappx-x64 | Universal Windows Platform X64 MSIX | /t:uwpappx-x64 /p:Keystore={keystore};KeystorePassword={keystore-password} |
| windows-win32 | Windows X86 | /t:windows-win32 |
| windows-x64 | Windows X64 | /t:windows-x64 |
Expand Down
2 changes: 1 addition & 1 deletion depends/libhdhomerun
Submodule libhdhomerun updated 10 files
+5 −0 Makefile
+1 −1 README.md
+61 −25 hdhomerun_discover.c
+106 −0 hdhomerun_discover_example.c
+27 −11 hdhomerun_os_posix.c
+3 −0 hdhomerun_os_posix.h
+25 −2 hdhomerun_os_windows.c
+3 −0 hdhomerun_os_windows.h
+2 −0 hdhomerun_sock_posix.c
+10 −0 hdhomerun_sock_windows.c
2 changes: 1 addition & 1 deletion depends/sqlite
Submodule sqlite updated 4 files
+7,947 −4,872 shell.c
+19,361 −7,166 sqlite3.c
+662 −199 sqlite3.h
+14 −0 sqlite3ext.h
2 changes: 1 addition & 1 deletion depends/xbmc
Submodule xbmc updated 3785 files
94 changes: 6 additions & 88 deletions msbuild.proj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<DisplayVersion></DisplayVersion> <!-- Set by AddonVersion Target; may override on the command line -->
<Keystore></Keystore> <!-- Must be set on the command line -->
<KeystorePassword></KeystorePassword> <!-- Must be set on the command line -->
<KodiBaseline>nexus</KodiBaseline>
<KodiBaseline>omega</KodiBaseline>
<ZipperExe>depends\build\zuki.build.tools.zipper.exe</ZipperExe>
</PropertyGroup>

Expand Down Expand Up @@ -620,47 +620,6 @@

</Target>

<!-- BUILD: UWPAPPX-WIN32 -->
<Target Name="uwpappx-win32" DependsOnTargets="AddonVersion;uwp-win32">

<Error Condition="'$(JAVA_HOME)' == ''" Text="Environment variable JAVA_HOME has not been set"/>
<Error Condition="'$(Keystore)' == ''" Text="Variable Keystore has not been set; specify with /p:Keystore=xxx;KeystorePassword=xxx"/>
<Error Condition="'$(KeystorePassword)' == ''" Text="Variable KeystorePassword has not been set; specify with /p:Keystore=xxx;KeystorePassword=xxx"/>

<PropertyGroup>
<BuildNumber>$([System.Version]::Parse($(AddonVersion)).Revision)</BuildNumber>
<AppxVersionCode>20.2.$(BuildNumber).0</AppxVersionCode>
<PhoneProductId>1F9928BF-0F41-49C8-941A-466153ED2C55</PhoneProductId>
<KodiAppx>Kodi-20230629-5f418d0b-Nexus-x86</KodiAppx>
<ZukiAppx>kodi-20.2-zuki.pvr.hdhomerundvr-win32-$(AddonVersion)</ZukiAppx>
<AppxNamespaces>&lt;Namespace Prefix='n' Uri='http://schemas.microsoft.com/appx/manifest/foundation/windows10' /&gt;&lt;Namespace Prefix='mp' Uri='http://schemas.microsoft.com/appx/2014/phone/manifest' /&gt;</AppxNamespaces>
</PropertyGroup>

<MakeDir Directories="tmp;out" ContinueOnError="false"/>
<Delete Files="tmp\$(ZukiAppx).pfx;out\$(ZukiAppx).cer"/>
<Exec Command="&quot;$(JAVA_HOME)\bin\keytool&quot; -importkeystore -srckeystore &quot;$(Keystore)&quot; -srcstorepass $(KeystorePassword) -srcstoretype JKS -destkeystore &quot;tmp\$(ZukiAppx).pfx&quot; -deststoretype PKCS12 -deststorepass $(KeystorePassword)" ContinueOnError="false"/>
<Exec Command="$(BashExe) -c &quot;openssl pkcs12 -in tmp/$(ZukiAppx).pfx -nokeys -out out/$(ZukiAppx).cer -password pass:$(KeystorePassword)&quot;" ContinueOnError="false"/>

<ReadCertificateSubject filename="tmp\$(ZukiAppx).pfx" password="$(KeystorePassword)">
<Output PropertyName="CertificateSubject" TaskParameter="subject"/>
</ReadCertificateSubject>

<MakeDir Directories="tmp" ContinueOnError="false"/>
<Message Condition="!Exists('tmp\$(KodiAppx).msix')" Importance="high" Text="Downloading $(KodiAppx).msix ..."/>
<Exec Condition="!Exists('tmp\$(KodiAppx).msix')" Command="curl http://mirrors.kodi.tv/nightlies/windows/uwp32/Nexus/$(KodiAppx).msix -L -o tmp\$(KodiAppx).msix " ContinueOnError="false" />

<RemoveDir Directories="out\$(KodiAppx)"/>
<Exec Command="makeappx unpack /p tmp\$(KodiAppx).msix /l /d out\$(KodiAppx)" ContinueOnError="false"/>
<Delete Files="out\$(KodiAppx)\AppxBlockMap.xml;out\$(KodiAppx)\AppxMetadata\CodeIntegrity.cat;out\$(KodiAppx)\AppxSignature.p7x"/>
<Exec Command="PowerShell Expand-Archive -Path out\zuki.pvr.hdhomerundvr-uwp-win32-$(KodiBaseline)-$(AddonVersion).zip -DestinationPath out\$(KodiAppx)\addons\" ContinueOnError="false"/>
<XmlPoke XmlInputPath="out\$(KodiAppx)\AppxManifest.xml" Namespaces="$(AppxNamespaces)" Query="//n:Package/n:Identity/@Publisher" Value="$(CertificateSubject)"/>
<XmlPoke XmlInputPath="out\$(KodiAppx)\AppxManifest.xml" Namespaces="$(AppxNamespaces)" Query="//n:Package/n:Identity/@Version" Value="$(AppxVersionCode)"/>
<XmlPoke XmlInputPath="out\$(KodiAppx)\AppxManifest.xml" Namespaces="$(AppxNamespaces)" Query="//n:Package/mp:PhoneIdentity/@PhoneProductId" Value="$([System.Guid]::NewGuid().ToString('d'))"/>
<Exec Command="makeappx pack /d out\$(KodiAppx) /l /o /p out\$(ZukiAppx).msix" ContinueOnError="false"/>
<Exec Command="signtool sign /fd SHA256 /a /f &quot;tmp\$(ZukiAppx).pfx&quot; /p $(KeystorePassword) out\$(ZukiAppx).msix" ContinueOnError="false"/>

</Target>

<!-- BUILD: UWPAPPX-X64 -->
<Target Name="uwpappx-x64" DependsOnTargets="AddonVersion;uwp-x64">

Expand All @@ -670,10 +629,10 @@

<PropertyGroup>
<BuildNumber>$([System.Version]::Parse($(AddonVersion)).Revision)</BuildNumber>
<AppxVersionCode>20.2.$(BuildNumber).0</AppxVersionCode>
<AppxVersionCode>21.0.$(BuildNumber).0</AppxVersionCode>
<PhoneProductId>1F9928BF-0F41-49C8-941A-466153ED2C55</PhoneProductId>
<KodiAppx>Kodi-20230629-5f418d0b-Nexus-x64</KodiAppx>
<ZukiAppx>kodi-20.2-zuki.pvr.hdhomerundvr-x64-$(AddonVersion)</ZukiAppx>
<KodiAppx>kodi-21.0-Omega_21.0.0.0-x64</KodiAppx>
<ZukiAppx>kodi-21.0-zuki.pvr.hdhomerundvr-x64-$(AddonVersion)</ZukiAppx>
<AppxNamespaces>&lt;Namespace Prefix='n' Uri='http://schemas.microsoft.com/appx/manifest/foundation/windows10' /&gt;&lt;Namespace Prefix='mp' Uri='http://schemas.microsoft.com/appx/2014/phone/manifest' /&gt;</AppxNamespaces>
</PropertyGroup>

Expand All @@ -688,7 +647,7 @@

<MakeDir Directories="tmp" ContinueOnError="false"/>
<Message Condition="!Exists('tmp\$(KodiAppx).msix')" Importance="high" Text="Downloading $(KodiAppx).msix ..."/>
<Exec Condition="!Exists('tmp\$(KodiAppx).msix')" Command="curl https://mirrors.kodi.tv/nightlies/windows/uwp64/Nexus/$(KodiAppx).msix -L -o tmp\$(KodiAppx).msix " ContinueOnError="false" />
<Exec Condition="!Exists('tmp\$(KodiAppx).msix')" Command="curl https://mirrors.kodi.tv/releases/windows/UWP/$(KodiAppx).msix -L -o tmp\$(KodiAppx).msix " ContinueOnError="false" />

<RemoveDir Directories="out\$(KodiAppx)"/>
<Exec Command="makeappx unpack /p tmp\$(KodiAppx).msix /l /d out\$(KodiAppx)" ContinueOnError="false"/>
Expand All @@ -702,51 +661,10 @@

</Target>

<!-- BUILD: UWPAPPX-ARM -->
<Target Name="uwpappx-arm" DependsOnTargets="AddonVersion;uwp-arm">

<Error Condition="'$(JAVA_HOME)' == ''" Text="Environment variable JAVA_HOME has not been set"/>
<Error Condition="'$(Keystore)' == ''" Text="Variable Keystore has not been set; specify with /p:Keystore=xxx;KeystorePassword=xxx"/>
<Error Condition="'$(KeystorePassword)' == ''" Text="Variable KeystorePassword has not been set; specify with /p:Keystore=xxx;KeystorePassword=xxx"/>

<PropertyGroup>
<BuildNumber>$([System.Version]::Parse($(AddonVersion)).Revision)</BuildNumber>
<AppxVersionCode>20.2.$(BuildNumber).0</AppxVersionCode>
<PhoneProductId>1F9928BF-0F41-49C8-941A-466153ED2C55</PhoneProductId>
<KodiAppx>Kodi-20230629-5f418d0b-Nexus-arm</KodiAppx>
<ZukiAppx>kodi-20.2-zuki.pvr.hdhomerundvr-arm-$(AddonVersion)</ZukiAppx>
<AppxNamespaces>&lt;Namespace Prefix='n' Uri='http://schemas.microsoft.com/appx/manifest/foundation/windows10' /&gt;&lt;Namespace Prefix='mp' Uri='http://schemas.microsoft.com/appx/2014/phone/manifest' /&gt;</AppxNamespaces>
</PropertyGroup>

<MakeDir Directories="tmp;out" ContinueOnError="false"/>
<Delete Files="tmp\$(ZukiAppx).pfx;out\$(ZukiAppx).cer"/>
<Exec Command="&quot;$(JAVA_HOME)\bin\keytool&quot; -importkeystore -srckeystore &quot;$(Keystore)&quot; -srcstorepass $(KeystorePassword) -srcstoretype JKS -destkeystore &quot;tmp\$(ZukiAppx).pfx&quot; -deststoretype PKCS12 -deststorepass $(KeystorePassword)" ContinueOnError="false"/>
<Exec Command="$(BashExe) -c &quot;openssl pkcs12 -in tmp/$(ZukiAppx).pfx -nokeys -out out/$(ZukiAppx).cer -password pass:$(KeystorePassword)&quot;" ContinueOnError="false"/>

<ReadCertificateSubject filename="tmp\$(ZukiAppx).pfx" password="$(KeystorePassword)">
<Output PropertyName="CertificateSubject" TaskParameter="subject"/>
</ReadCertificateSubject>

<MakeDir Directories="tmp" ContinueOnError="false"/>
<Message Condition="!Exists('tmp\$(KodiAppx).msix')" Importance="high" Text="Downloading $(KodiAppx).msix ..."/>
<Exec Condition="!Exists('tmp\$(KodiAppx).msix')" Command="curl http://mirrors.kodi.tv/nightlies/windows/uwp-arm/Nexus/$(KodiAppx).msix -L -o tmp\$(KodiAppx).msix " ContinueOnError="false" />

<RemoveDir Directories="out\$(KodiAppx)"/>
<Exec Command="makeappx unpack /p tmp\$(KodiAppx).msix /l /d out\$(KodiAppx)" ContinueOnError="false"/>
<Delete Files="out\$(KodiAppx)\AppxBlockMap.xml;out\$(KodiAppx)\AppxMetadata\CodeIntegrity.cat;out\$(KodiAppx)\AppxSignature.p7x"/>
<Exec Command="PowerShell Expand-Archive -Path out\zuki.pvr.hdhomerundvr-uwp-arm-$(KodiBaseline)-$(AddonVersion).zip -DestinationPath out\$(KodiAppx)\addons\" ContinueOnError="false"/>
<XmlPoke XmlInputPath="out\$(KodiAppx)\AppxManifest.xml" Namespaces="$(AppxNamespaces)" Query="//n:Package/n:Identity/@Publisher" Value="$(CertificateSubject)"/>
<XmlPoke XmlInputPath="out\$(KodiAppx)\AppxManifest.xml" Namespaces="$(AppxNamespaces)" Query="//n:Package/n:Identity/@Version" Value="$(AppxVersionCode)"/>
<XmlPoke XmlInputPath="out\$(KodiAppx)\AppxManifest.xml" Namespaces="$(AppxNamespaces)" Query="//n:Package/mp:PhoneIdentity/@PhoneProductId" Value="$([System.Guid]::NewGuid().ToString('d'))"/>
<Exec Command="makeappx pack /d out\$(KodiAppx) /l /o /p out\$(ZukiAppx).msix" ContinueOnError="false"/>
<Exec Command="signtool sign /fd SHA256 /a /f &quot;tmp\$(ZukiAppx).pfx&quot; /p $(KeystorePassword) out\$(ZukiAppx).msix" ContinueOnError="false"/>

</Target>

<!-- BUILD: PLATFORMS -->
<Target Name="windows" DependsOnTargets="windows-win32;windows-x64"/>
<Target Name="uwp" DependsOnTargets="uwp-win32;uwp-x64;uwp-arm"/>
<Target Name="uwpappx" DependsOnTargets="uwpappx-win32;uwpappx-x64;uwpappx-arm"/>
<Target Name="uwpappx" DependsOnTargets="uwpappx-x64"/>
<Target Name="linux" DependsOnTargets="linux-i686;linux-x86_64;linux-armel;linux-armhf;linux-aarch64"/>
<Target Name="osx" DependsOnTargets="osx-x86_64"/>
<Target Name="android" DependsOnTargets="android-arm;android-aarch64;android-x86;android-x86_64"/>
Expand Down
4 changes: 4 additions & 0 deletions pvr.hdhomerundvr/changelog.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
v21.9.3 (2024.04.06)
- Update libhdhomerun library to version 20231109
- Update SQLite database engine to version 3.45.2

v20.9.2 (2023.07.13)
- Remove cURL low speed limit detection options on HTTP streams

Expand Down
2 changes: 1 addition & 1 deletion src/version.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
Company=Michael G. Brehm
Copyright=
Product=zuki.pvr.hdhomerundvr
Version=20.9.2
Version=21.9.3
8 changes: 4 additions & 4 deletions template/addon.xml.tt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
<requires>
<import addon="kodi.binary.global.main" version="2.0.2"/>
<import addon="kodi.binary.global.general" version="1.0.5"/>
<import addon="kodi.binary.global.filesystem" version="1.1.7"/>
<import addon="kodi.binary.global.filesystem" version="1.1.8"/>
<import addon="kodi.binary.global.gui" version="5.15.0"/>
<import addon="kodi.binary.instance.pvr" version="8.2.0"/>
<import addon="kodi.binary.instance.pvr" version="8.3.0"/>
</requires>
<extension point="kodi.pvrclient" needs_configuration="false" library_<#= this.Host.ResolveParameterValue("", "", "libraryplatform") #>="<#= this.Host.ResolveParameterValue("", "", "libraryname") #>"/>
<# if(!String.IsNullOrEmpty(this.Host.ResolveParameterValue("", "", "repomanifest"))) { #> <extension point="xbmc.addon.repository">
<dir>
<info>https://raw.githubusercontent.com/djp952/repository.hdhomerundvr/Nexus/<#= this.Host.ResolveParameterValue("", "", "repomanifest") #></info>
<checksum verify="sha256">https://raw.githubusercontent.com/djp952/repository.hdhomerundvr/Nexus/<#= this.Host.ResolveParameterValue("", "", "repomanifest") #>.sha256</checksum>
<info>https://raw.githubusercontent.com/djp952/repository.hdhomerundvr/Omega/<#= this.Host.ResolveParameterValue("", "", "repomanifest") #></info>
<checksum verify="sha256">https://raw.githubusercontent.com/djp952/repository.hdhomerundvr/Omega/<#= this.Host.ResolveParameterValue("", "", "repomanifest") #>.sha256</checksum>
<datadir>https://github.com/djp952/pvr.hdhomerundvr/releases/download</datadir>
<artdir>https://github.com/djp952/pvr.hdhomerundvr/releases/download</artdir>
<hashes>sha256</hashes>
Expand Down
6 changes: 3 additions & 3 deletions template/addons.xml.tt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
<requires>
<import addon="kodi.binary.global.main" version="2.0.2"/>
<import addon="kodi.binary.global.general" version="1.0.5"/>
<import addon="kodi.binary.global.filesystem" version="1.1.7"/>
<import addon="kodi.binary.global.filesystem" version="1.1.8"/>
<import addon="kodi.binary.global.gui" version="5.15.0"/>
<import addon="kodi.binary.instance.pvr" version="8.2.0"/>
<import addon="kodi.binary.instance.pvr" version="8.3.0"/>
</requires>
<extension point="kodi.pvrclient" needs_configuration="false" library_<#= this.Host.ResolveParameterValue("", "", "libraryplatform") #>="<#= this.Host.ResolveParameterValue("", "", "libraryname") #>"/>
<extension point="xbmc.addon.metadata">
<summary lang="en_GB">HDHomeRun DVR PVR Client</summary>
<platform><#= this.Host.ResolveParameterValue("", "", "platform") #></platform>
<size><#= this.Host.ResolveParameterValue("", "", "zipfilesize") #></size>
<path>nexus-<#= this.Host.ResolveParameterValue("", "", "displayversion") #>/<#= this.Host.ResolveParameterValue("", "", "zipfilename") #></path>
<path>omega-<#= this.Host.ResolveParameterValue("", "", "displayversion") #>/<#= this.Host.ResolveParameterValue("", "", "zipfilename") #></path>
</extension>
</addon>
</addons>

0 comments on commit 6fd3715

Please sign in to comment.