Permalink
Browse files

Updates for 9.1.7 including changelog [ci release]

changes included to build imageLoader and swscale dll's on windows
  • Loading branch information...
jusjoken committed Sep 24, 2017
1 parent 32e1183 commit f9f803d9d4f7bd4887cd6ad9feb41caa6bf5591f
View
@@ -1,6 +1,6 @@
# Change Log
## Version 9.1.7 (?)
## Version 9.1.7 (2017-09-24)
* Fix: add support for 2nd tuner of Hauppauge WinTV-dualHD usb tuner stick (Windows).
* Changes in the STV set 2017081201 for the next SageTV release v9.1.7.0:
* malore menus: Removed random misc adjectives after show titles; only display misc textafter the title if it is a star rating.
@@ -13,6 +13,7 @@
* Configuration Wizard playback testing/configuration menu uses the "Default" decoder settings instead of SageTV MPEG decoders.
* Detailed Setup -> Customize: renamed extra option to mark channels in guide with non-Zap2it channel IDs to refer to non-Tribune IDs.
* Changed Zap2it text to Tribune elsewhere in the STV, since the EPG data fo the old built-in and new SD EPG data both ultimately come from Tribune.
* Fix: resolved 'Grey-scale channel logos are green and half-width' for Windows releases (was fixed for linux in 9.0.8.423 and newer)
## Version 9.1.6 (2017-08-10)
* Fix: Various fixes and cleanup on Linux Firewire and DVB.
View
@@ -0,0 +1,27 @@
#!/bin/sh
cd ../buildwin
mkdir dll
cd dll
# build the image library dependencies
cd ../../third_party/codecs/giflib
./configure --with-pic || { echo "Build failed, exiting."; exit 1; }
make # Building utils has an issue. Skip error check. || { echo "Build failed, exiting."; exit 1; }
cd ../jpeg-6b
./configure CFLAGS=-fPIC || { echo "Build failed, exiting."; exit 1; }
make
cd ../libpng
./configure --with-pic || { echo "Build failed, exiting."; exit 1; }
make
cd ../tiff
./configure --with-pic || { echo "Build failed, exiting."; exit 1; }
make
cd ../../../buildwin/dll
make -C ../../third_party/SageTV-LGPL/imageload -f Makefile.win || { echo "Build failed, exiting."; exit 1; }
cp ../../third_party/SageTV-LGPL/imageload/*.dll .
@@ -87,6 +87,10 @@ if errorlevel 1 goto CopyFailure
xcopy "%_supportDir%\SupportBinaries" "%_targetDir%" /i /q /e
if errorlevel 1 goto CopyFailure
@REM Copy the imageloader and swscale Binaries - from buildwin\dll
xcopy "%_projectDir%..\..\..\buildwin\dll\*.dll" "%_targetDir%\SageTV" /i /q /e
if errorlevel 1 goto CopyFailure
@REM Copy the elf build files - these for now are stored in this location from a ZIP
xcopy "%_supportDir%\elf" "%_targetDir%\SageTV" /i /q /e
if errorlevel 1 goto CopyFailure
@@ -104,9 +108,11 @@ goto PreBuildSuccess
echo Starting pre-build processing for %_configName%
@REM Copy the Support Binaries - these are ones where I could not find source
xcopy "%_supportDir%\SupportBinaries\SageTV\ImageLoader.dll" "%_targetDir%\Placeshifter\" /q
xcopy "%_supportDir%\SupportBinaries\SageTV\pthreadGC2.dll" "%_targetDir%\Placeshifter\" /q
xcopy "%_supportDir%\SupportBinaries\SageTV\swscale.dll" "%_targetDir%\Placeshifter\" /q
if errorlevel 1 goto CopyFailure
@REM Copy the imageloader and swscale Binaries - from buildwin\dll
xcopy "%_projectDir%..\..\..\buildwin\dll\*.dll" "%_targetDir%\Placeshifter" /i /q /e
if errorlevel 1 goto CopyFailure
@REM Copy the thirdparty license
@@ -6,6 +6,7 @@
<String Id="InstallMessage">Setup will install [WixBundleName] on your computer. Click Install to continue, Options to set the install directory or Close to exit.</String>
<String Id="InstallVersion">Version [WixBundleVersion]</String>
<String Id="InstallerVersion">Installer ([SageInstallerVersion])</String>
<String Id="InstallFolder">Install Folder ([InstallFolder])</String>
<String Id="ConfirmCancelMessage">Are you sure you want to cancel?</String>
<String Id="ExecuteUpgradeRelatedBundleMessage">Previous version</String>
<String Id="HelpHeader">Setup Help</String>
@@ -24,6 +24,8 @@
<Hypertext Name="EulaHyperlink" X="185" Y="-111" Width="-11" Height="17" TabStop="yes" FontId="3" HideWhenDisabled="yes">#(loc.InstallLicenseLinkText)</Hypertext>
<Text X="185" Y="-81" Width="-11" Height="17" FontId="3" DisablePrefix="yes">#(loc.InstallVersion)</Text>
<Checkbox Name="EulaAcceptCheckbox" X="185" Y="-51" Width="-11" Height="17" TabStop="yes" FontId="3" HideWhenDisabled="yes">#(loc.InstallAcceptCheckbox)</Checkbox>
<Text X="185" Y="-154" Width="-11" Height="17" FontId="3" DisablePrefix="yes"> - use Options to change</Text>
<Text X="185" Y="-171" Width="-11" Height="17" FontId="3" DisablePrefix="yes">#(loc.InstallFolder)</Text>
<Text X="185" Y="-11" Width="-11" Height="17" FontId="3" DisablePrefix="yes">#(loc.InstallerVersion)</Text>
<Button Name="OptionsButton" X="-171" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.InstallOptionsButton)</Button>
<Button Name="InstallButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.InstallInstallButton)</Button>
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Created by InstallerBuild.ps1 script 12-Aug-2017 09:35 -->
<!-- Created by InstallerBuild.ps1 script 24-Sep-2017 13:39 -->
<Include>
<?define MajorVersion="9" ?>
<?define MinorVersion="1" ?>
<?define BuildVersion="6" ?>
<?define BuildVersion="7" ?>
<?define VersionNumber="$(var.MajorVersion).$(var.MinorVersion).$(var.BuildVersion)" ?>
</Include>
View
@@ -1,10 +1,10 @@
/* Created by InstallerBuild.ps1 script 12-Aug-2017 09:35 */
/* Created by InstallerBuild.ps1 script 24-Sep-2017 13:39 */
#define STRINGIZE2(s) #s
#define STRINGIZE(s) STRINGIZE2(s)
#define VERSION_MAJOR 9
#define VERSION_MINOR 1
#define VERSION_REVISION 6
#define VERSION_REVISION 7
#define VER_FILE_VERSION VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION
#define VER_FILE_VERSION_STR STRINGIZE(VERSION_MAJOR) \
@@ -1,21 +1,20 @@
CC=gcc
#CFLAGS = -c -D_JNI_IMPLEMENTATION -IC:\\jdk1.4\\include -IC:\\jdk1.4\\include\\win32
CFLAGS = -c -O2 -s -D_JNI_IMPLEMENTATION -I/mingw/include -IC:\\jdk1.4\\include -IC:\\jdk1.4\\include\\win32 -I/usr/local/include -DJava_sage_media_image_ImageLoader_createThumbnail=_Java_sage_media_image_ImageLoader_createThumbnail -DJava_sage_media_image_ImageLoader_loadScaledImageFromFile=_Java_sage_media_image_ImageLoader_loadScaledImageFromFile -DJava_sage_media_image_ImageLoader_freeImage0=_Java_sage_media_image_ImageLoader_freeImage0 -DJava_sage_media_image_ImageLoader_compressImageToFile=_Java_sage_media_image_ImageLoader_compressImageToFile -DJava_sage_media_image_ImageLoader_loadImageDimensionsFromFile=_Java_sage_media_image_ImageLoader_loadImageDimensionsFromFile -DJava_sage_media_image_ImageLoader_scaleRawImage=_Java_sage_media_image_ImageLoader_scaleRawImage
CFLAGS = -c -O2 -s -D_JNI_IMPLEMENTATION -I/mingw/include -IC:\\jdk1.4\\include -IC:\\jdk1.4\\include\\win32 -I/usr/local/include -I../../../native/include -I../../codecs/giflib/lib -DJava_sage_media_image_ImageLoader_createThumbnail=_Java_sage_media_image_ImageLoader_createThumbnail -DJava_sage_media_image_ImageLoader_loadScaledImageFromFile=_Java_sage_media_image_ImageLoader_loadScaledImageFromFile -DJava_sage_media_image_ImageLoader_freeImage0=_Java_sage_media_image_ImageLoader_freeImage0 -DJava_sage_media_image_ImageLoader_compressImageToFile=_Java_sage_media_image_ImageLoader_compressImageToFile -DJava_sage_media_image_ImageLoader_loadImageDimensionsFromFile=_Java_sage_media_image_ImageLoader_loadImageDimensionsFromFile -DJava_sage_media_image_ImageLoader_scaleRawImage=_Java_sage_media_image_ImageLoader_scaleRawImage
OBJFILES=imageload.o sage_media_image_ImageLoader.o
all: swscale.dll ImageLoader.dll
swscale.dll: swscale.o
$(CC) -shared -W1 -o swscale.dll swscale.o -L/mingw/lib -L/usr/local/lib
$(CC) -shared -W -o swscale.dll swscale.o -L/mingw/lib -L/usr/local/lib
ImageLoader.dll: $(OBJFILES)
$(CC) -shared -W1 -o ImageLoader.dll $(OBJFILES) -L/mingw/lib -ljpeg -lregif -lpng -lz -L/usr/local/lib -ltiff -L. -lswscale
$(CC) -s -static-libgcc -shared -W -o ImageLoader.dll $(OBJFILES) ../../codecs/giflib/lib/.libs/libgif.a ../../codecs/libpng/.libs/libpng12.a ../../codecs/jpeg-6b/libjpeg.a -lz ../../codecs/tiff/libtiff/.libs/libtiff.a -L. -lswscale
imagetest: test.o $(OBJFILES)
$(CC) -o imagetest $(OBJFILES) -L/mingw/lib -ljpeg -lregif -lpng -lz -L/usr/local/lib -ltiff -L. -lswscale
$(CC) -s -static-libgcc test.c -o imagetest.exe $(OBJFILES) ../../codecs/giflib/lib/.libs/libgif.a ../../codecs/libpng/.libs/libpng12.a ../../codecs/jpeg-6b/libjpeg.a -lz ../../codecs/tiff/libtiff/.libs/libtiff.a -L. -lswscale
swscale.o: swscale_template.c
clean:
rm -f *.o imagetest ImageLoader.dll *.c~ *.h~ swscale.dll
rm -f *.o imagetest ImageLoader.dll *.c~ *.h~ swscale.dll
Oops, something went wrong.

0 comments on commit f9f803d

Please sign in to comment.