Skip to content

Commit 0cd2500

Browse files
author
u-voelkel
committed
- fixed #2929819
- svn 660 setup
1 parent 739f53f commit 0cd2500

File tree

4 files changed

+136
-111
lines changed

4 files changed

+136
-111
lines changed

‎ChangeLog

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
Version
1+
Version SVN-660 2010-01-11
22

33
* fixed subscription parsing for coherence UPnP framework
44
* initial support for wpl playlists (Robert Massaioli)
55
* initial ffmpegthumbnailer plugin
6-
6+
* initial windows service
7+
* WMP 11 support
8+
* cleanup and bugfixes
9+
* added album & genre search/sort capabilities
710

811

912
Version SVN-640 2009-07-19

‎crosscompile_win32.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ echo "strip and touch libraries and executables? [Y/n]"
194194
DO_STRIP="no"
195195
read strip
196196
if test "$strip" != "n"; then
197-
HDO_STRIP="yes"
197+
DO_STRIP="yes"
198198
fi
199199

200200

‎setup/fuppes.iss

Lines changed: 126 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -1,106 +1,126 @@
1-
[Setup]
2-
AppName=Free UPnP Entertainment Service
3-
AppVerName=Free UPnP Entertainment Service SVN-640
4-
AppPublisher=Ulrich Völkel
5-
AppPublisherURL=http://sourceforge.net/projects/fuppes
6-
AppSupportURL=http://sourceforge.net/projects/fuppes
7-
AppUpdatesURL=http://sourceforge.net/projects/fuppes
8-
DefaultDirName={pf}\Free UPnP Entertainment Service\
9-
DefaultGroupName=Free UPnP Entertainment Service
10-
LicenseFile=..\setup\license-eng.rtf
11-
OutputDir=..\setup
12-
OutputBaseFilename=fuppes-SVN-640-win32-setup
13-
SolidCompression=true
14-
ShowTasksTreeLines=true
15-
SourceDir=..\setup
16-
AppCopyright=Ulrich Völkel
17-
WizardImageFile=compiler:wizmodernimage-is.bmp
18-
WizardSmallImageFile=compiler:wizmodernsmallimage-is.bmp
19-
ShowLanguageDialog=auto
20-
SetupIconFile=..\fuppes.ico
21-
22-
[Languages]
23-
Name: eng; Messagesfile: compiler:Default.isl; LicenseFile: ..\setup\license-eng.rtf
24-
Name: ger; Messagesfile: compiler:Languages\German.isl; LicenseFile: ..\setup\license-eng.rtf
25-
26-
[Tasks]
27-
Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked
28-
Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked
29-
Name: presentation; Description: install webinterface plugin; GroupDescription: {cm:MiscPlugins}; Languages: ; Flags: unchecked
30-
Name: metadata_dlna; Description: install DLNA profiles plugin; GroupDescription: {cm:MetadataPlugins}
31-
Name: metadata_taglib; Description: install taglib plugin; GroupDescription: {cm:MetadataPlugins}
32-
Name: metadata_exiv2; Description: install exiv2 plugin; GroupDescription: {cm:MetadataPlugins}
33-
Name: metadata_simage; Description: install simage plugin; GroupDescription: {cm:MetadataPlugins}
34-
Name: metadata_magickwand; Description: install ImageMagick plugin; GroupDescription: {cm:MetadataPlugins}; Flags: unchecked
35-
Name: metadata_libavformat; Description: install libavformat plugin; GroupDescription: {cm:MetadataPlugins}
36-
Name: decoder_vorbis; Description: install ogg/vorbis plugin; GroupDescription: {cm:AudioDecoderPlugins}
37-
Name: decoder_flac; Description: install FLAC plugin; GroupDescription: {cm:AudioDecoderPlugins}
38-
Name: decoder_musepack; Description: install MusePack/mpc plugin; GroupDescription: {cm:AudioDecoderPlugins}
39-
Name: transcoder_ffmpeg; Description: install ffmpeg plugin; GroupDescription: {cm:TranscoderPlugins}
40-
Name: transcoder_magickwand; Description: install ImageMagick plugin; GroupDescription: {cm:TranscoderPlugins}; Flags: unchecked
41-
42-
[Files]
43-
Source: ..\ChangeLog; DestDir: "{app}"; DestName: ChangeLog.txt
44-
Source: ..\AUTHORS; DestDir: "{app}"; DestName: AUTHORS.txt
45-
Source: ..\COPYING; DestDir: "{app}"; DestName: COPYING.txt
46-
Source: ..\setup\COPYING-VORBIS.txt; DestDir: "{app}"; Tasks: " decoder_vorbis"
47-
Source: ..\setup\COPYING-OGG.txt; DestDir: "{app}"; Tasks: " decoder_vorbis"
48-
Source: ..\setup\COPYING-FLAC.txt; DestDir: "{app}"; Tasks: " decoder_flac"
49-
Source: ..\setup\COPYING-MUSEPACK.txt; DestDir: "{app}"; Tasks: " decoder_musepack"
50-
Source: ..\setup\ImageMagick-License.txt; DestDir: "{app}"; Tasks: " metadata_magickwand transcoder_magickwand"
51-
Source: ..\..\win32\fuppes.exe; DestDir: "{app}"
52-
Source: ..\..\win32\fuppes-win.exe; DestDir: "{app}"
53-
Source: ..\..\win32\libfuppes-0.dll; DestDir: "{app}"
54-
Source: ..\..\win32\libiconv-2.dll; DestDir: "{app}"
55-
Source: ..\..\win32\libpcre-0.dll; DestDir: "{app}"
56-
Source: ..\..\win32\libxml2-2.dll; DestDir: "{app}"
57-
Source: ..\..\win32\libz-0.dll; DestDir: "{app}"
58-
Source: ..\..\win32\libdatabase_sqlite3-0.dll; DestDir: "{app}"
59-
Source: ..\..\win32\libsqlite3-0.dll; DestDir: "{app}"
60-
Source: ..\..\win32\libcore_presentation-0.dll; DestDir: "{app}"; Tasks: " presentation"
61-
Source: ..\..\win32\data\fuppes-small.png; DestDir: "{app}\data"
62-
Source: ..\..\win32\data\header-gradient.png; DestDir: "{app}\data"
63-
Source: ..\..\win32\data\header-gradient-small.png; DestDir: "{app}\data"
64-
Source: ..\..\win32\data\style.css; DestDir: "{app}\data"
65-
Source: ..\..\win32\libmetadata_dlna_profiles-0.dll; DestDir: "{app}"; Tasks: " metadata_dlna"
66-
Source: ..\..\win32\libmetadata_taglib-0.dll; DestDir: "{app}"; Tasks: " metadata_taglib"
67-
Source: ..\..\win32\libtag-1.dll; DestDir: "{app}"; Tasks: " metadata_taglib"
68-
Source: ..\..\win32\libmetadata_exiv2-0.dll; DestDir: "{app}"; Tasks: " metadata_exiv2"
69-
Source: ..\..\win32\libexiv2-5.dll; DestDir: "{app}"; Tasks: " metadata_exiv2"
70-
Source: ..\..\win32\libmetadata_simage-0.dll; DestDir: "{app}"; Tasks: " metadata_simage"
71-
Source: ..\..\win32\libsimage-20.dll; DestDir: "{app}"; Tasks: " metadata_simage"
72-
Source: ..\..\win32\libmetadata_libavformat-0.dll; DestDir: "{app}"; Tasks: " metadata_libavformat"
73-
Source: ..\..\win32\avformat-52.dll; DestDir: "{app}"; Tasks: " metadata_libavformat transcoder_ffmpeg"
74-
Source: ..\..\win32\avcodec-52.dll; DestDir: "{app}"; Tasks: " metadata_libavformat transcoder_ffmpeg"
75-
Source: ..\..\win32\avutil-50.dll; DestDir: "{app}"; Tasks: " metadata_libavformat transcoder_ffmpeg"
76-
Source: ..\..\win32\libmetadata_magickwand-0.dll; DestDir: "{app}"; Tasks: " metadata_magickwand"
77-
Source: ..\..\win32\libMagickWand-2.dll; DestDir: "{app}"; Tasks: " metadata_magickwand transcoder_magickwand"
78-
Source: ..\..\win32\libMagickCore-2.dll; DestDir: "{app}"; Tasks: " metadata_magickwand transcoder_magickwand"
79-
Source: ..\..\win32\libdecoder_vorbis-0.dll; DestDir: "{app}"; Tasks: " decoder_vorbis"
80-
Source: ..\..\win32\libvorbisfile-3.dll; DestDir: "{app}"; Tasks: " decoder_vorbis"
81-
Source: ..\..\win32\libvorbis-0.dll; DestDir: "{app}"; Tasks: " decoder_vorbis"
82-
Source: ..\..\win32\libogg-0.dll; DestDir: "{app}"; Tasks: " decoder_vorbis"
83-
Source: ..\..\win32\libdecoder_flac-0.dll; DestDir: "{app}"; Tasks: " decoder_flac"
84-
Source: ..\..\win32\libFLAC-8.dll; DestDir: "{app}"; Tasks: " decoder_flac"
85-
Source: ..\..\win32\libdecoder_musepack-0.dll; DestDir: "{app}"; Tasks: " decoder_musepack"
86-
Source: ..\..\win32\libmpcdec-5.dll; DestDir: "{app}"; Tasks: " decoder_musepack"
87-
Source: ..\..\win32\libtranscoder_ffmpeg-0.dll; DestDir: "{app}"; Tasks: " transcoder_ffmpeg"
88-
Source: ..\..\win32\swscale-0.dll; DestDir: "{app}"; Tasks: " transcoder_ffmpeg"
89-
Source: ..\..\win32\libtranscoder_magickwand-0.dll; DestDir: "{app}"; Tasks: " transcoder_magickwand"
90-
91-
[Icons]
92-
Name: {group}\FUPPES; Filename: "{app}\fuppes.exe"; IconIndex: 0
93-
Name: {group}\{cm:UninstallProgram,FUPPES}; Filename: {uninstallexe}
94-
Name: {userdesktop}\FUPPES; Filename: "{app}\fuppes.exe"; Tasks: desktopicon; IconIndex: 0
95-
Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\FUPPES; Filename: "{app}\fuppes.exe"; Tasks: quicklaunchicon; Languages: ; IconIndex: 0
96-
Name: {group}\Edit configuration; Filename: {userappdata}\FUPPES\fuppes.cfg; Tasks: ; Languages:
97-
Name: {group}\FUPPES (command line); Filename: "{app}\fuppescmd.exe"; IconIndex: 0
98-
99-
[Run]
100-
Filename: "{app}\fuppes.exe"; Description: {cm:LaunchProgram,Free UPnP Entertainment Service}; Flags: nowait postinstall skipifsilent unchecked; Tasks: ; Languages:
101-
[CustomMessages]
102-
MiscPlugins=miscellaneous plugins
103-
MetadataPlugins=metadata plugins
104-
AudioDecoderPlugins=audio decoder plugins
105-
AudioEncoderPlugins=audio encoder plugins
106-
TranscoderPlugins=transcoding plugins
1+
[Setup]
2+
AppName=Free UPnP Entertainment Service
3+
AppVerName=Free UPnP Entertainment Service SVN-660
4+
AppPublisher=Ulrich Völkel
5+
AppPublisherURL=http://sourceforge.net/projects/fuppes
6+
AppSupportURL=http://sourceforge.net/projects/fuppes
7+
AppUpdatesURL=http://sourceforge.net/projects/fuppes
8+
DefaultDirName={pf}\Free UPnP Entertainment Service\
9+
DefaultGroupName=Free UPnP Entertainment Service
10+
LicenseFile=..\setup\license-eng.rtf
11+
OutputDir=..\setup
12+
OutputBaseFilename=fuppes-SVN-660-win32-setup
13+
SolidCompression=true
14+
ShowTasksTreeLines=true
15+
SourceDir=..\setup
16+
AppCopyright=Ulrich Völkel
17+
WizardImageFile=compiler:wizmodernimage-is.bmp
18+
WizardSmallImageFile=compiler:wizmodernsmallimage-is.bmp
19+
ShowLanguageDialog=auto
20+
SetupIconFile=..\src\windows\fuppes.ico
21+
22+
[Languages]
23+
Name: eng; Messagesfile: compiler:Default.isl; LicenseFile: ..\setup\license-eng.rtf
24+
Name: ger; Messagesfile: compiler:Languages\German.isl; LicenseFile: ..\setup\license-eng.rtf
25+
26+
[Tasks]
27+
Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked
28+
Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked
29+
;Name: presentation; Description: install webinterface plugin; GroupDescription: {cm:MiscPlugins}; Languages: ; Flags: unchecked
30+
;Name: metadata_dlna; Description: install DLNA profiles plugin; GroupDescription: {cm:MetadataPlugins}
31+
;Name: metadata_taglib; Description: install taglib plugin; GroupDescription: {cm:MetadataPlugins}
32+
;Name: metadata_exiv2; Description: install exiv2 plugin; GroupDescription: {cm:MetadataPlugins}
33+
;Name: metadata_simage; Description: install simage plugin; GroupDescription: {cm:MetadataPlugins}
34+
;Name: metadata_magickwand; Description: install ImageMagick plugin; GroupDescription: {cm:MetadataPlugins}; Flags: unchecked
35+
;Name: metadata_libavformat; Description: install libavformat plugin; GroupDescription: {cm:MetadataPlugins}
36+
;Name: decoder_vorbis; Description: install ogg/vorbis plugin; GroupDescription: {cm:AudioDecoderPlugins}
37+
;Name: decoder_flac; Description: install FLAC plugin; GroupDescription: {cm:AudioDecoderPlugins}
38+
;Name: decoder_musepack; Description: install MusePack/mpc plugin; GroupDescription: {cm:AudioDecoderPlugins}
39+
;Name: transcoder_ffmpeg; Description: install ffmpeg plugin; GroupDescription: {cm:TranscoderPlugins}
40+
;Name: transcoder_magickwand; Description: install ImageMagick plugin; GroupDescription: {cm:TranscoderPlugins}; Flags: unchecked
41+
42+
[Files]
43+
Source: ..\ChangeLog; DestDir: {app}; DestName: ChangeLog.txt
44+
Source: ..\AUTHORS; DestDir: {app}; DestName: AUTHORS.txt
45+
Source: ..\COPYING; DestDir: {app}; DestName: COPYING.txt
46+
;Source: ..\setup\COPYING-VORBIS.txt; DestDir: {app}; Tasks: " decoder_vorbis"
47+
;Source: ..\setup\COPYING-OGG.txt; DestDir: {app}; Tasks: " decoder_vorbis"
48+
;Source: ..\setup\COPYING-FLAC.txt; DestDir: {app}; Tasks: " decoder_flac"
49+
;Source: ..\setup\COPYING-MUSEPACK.txt; DestDir: {app}; Tasks: " decoder_musepack"
50+
;Source: ..\setup\ImageMagick-License.txt; DestDir: {app}; Tasks: " metadata_magickwand transcoder_magickwand"
51+
Source: ..\setup\COPYING-VORBIS.txt; DestDir: {app}
52+
Source: ..\setup\COPYING-OGG.txt; DestDir: {app}
53+
Source: ..\setup\COPYING-FLAC.txt; DestDir: {app}
54+
Source: ..\setup\COPYING-MUSEPACK.txt; DestDir: {app}
55+
Source: ..\setup\ImageMagick-License.txt; DestDir: {app}
56+
Source: ..\win32\avcodec-52.dll; DestDir: {app}
57+
Source: ..\win32\avformat-52.dll; DestDir: {app}
58+
Source: ..\win32\avutil-50.dll; DestDir: {app}
59+
Source: ..\win32\fuppes.exe; DestDir: {app}
60+
Source: ..\win32\fuppes-svc.exe; DestDir: {app}
61+
Source: ..\win32\fuppes-win.exe; DestDir: {app}
62+
Source: ..\win32\libdatabase_sqlite3-0.dll; DestDir: {app}
63+
Source: ..\win32\libdecoder_flac-0.dll; DestDir: {app}
64+
Source: ..\win32\libdecoder_musepack-0.dll; DestDir: {app}
65+
Source: ..\win32\libdecoder_vorbis-0.dll; DestDir: {app}
66+
Source: ..\win32\libencoder_pcm-0.dll; DestDir: {app}
67+
Source: ..\win32\libencoder_wav-0.dll; DestDir: {app}
68+
Source: ..\win32\libexiv2-5.dll; DestDir: {app}
69+
Source: ..\win32\libffmpegthumbnailer-3.dll; DestDir: {app}
70+
Source: ..\win32\libFLAC-8.dll; DestDir: {app}
71+
Source: ..\win32\libfuppes-0.dll; DestDir: {app}
72+
Source: ..\win32\libiconv-2.dll; DestDir: {app}
73+
Source: ..\win32\libjpeg-7.dll; DestDir: {app}
74+
Source: ..\win32\libMagickCore-2.dll; DestDir: {app}
75+
Source: ..\win32\libMagickWand-2.dll; DestDir: {app}
76+
Source: ..\win32\libmetadata_dlna_profiles-0.dll; DestDir: {app}
77+
Source: ..\win32\libmetadata_exiv2-0.dll; DestDir: {app}
78+
Source: ..\win32\libmetadata_ffmpegthumbnailer-0.dll; DestDir: {app}
79+
Source: ..\win32\libmetadata_libavformat-0.dll; DestDir: {app}
80+
Source: ..\win32\libmetadata_magickwand-0.dll; DestDir: {app}
81+
Source: ..\win32\libmetadata_simage-0.dll; DestDir: {app}
82+
Source: ..\win32\libmetadata_taglib-0.dll; DestDir: {app}
83+
Source: ..\win32\libmpcdec-5.dll; DestDir: {app}
84+
Source: ..\win32\libogg-0.dll; DestDir: {app}
85+
Source: ..\win32\libpcre-0.dll; DestDir: {app}
86+
Source: ..\win32\libpng12-0.dll; DestDir: {app}
87+
Source: ..\win32\libsimage-20.dll; DestDir: {app}
88+
Source: ..\win32\libsqlite3-0.dll; DestDir: {app}
89+
Source: ..\win32\libtag-1.dll; DestDir: {app}
90+
Source: ..\win32\libtranscoder_ffmpeg-0.dll; DestDir: {app}
91+
Source: ..\win32\libtranscoder_magickwand-0.dll; DestDir: {app}
92+
Source: ..\win32\libvorbis-0.dll; DestDir: {app}
93+
Source: ..\win32\libvorbisfile-3.dll; DestDir: {app}
94+
Source: ..\win32\libxml2-2.dll; DestDir: {app}
95+
Source: ..\win32\libz-0.dll; DestDir: {app}
96+
Source: ..\win32\swscale-0.dll; DestDir: {app}
97+
Source: ..\win32\data\fuppes-small.png; DestDir: {app}\data
98+
Source: ..\win32\data\header-gradient.png; DestDir: {app}\data
99+
Source: ..\win32\data\header-gradient-small.png; DestDir: {app}\data
100+
Source: ..\win32\data\style.css; DestDir: {app}\data
101+
Source: ..\win32\magick-modules\bmp.dll; DestDir: {app}\magick-modules
102+
Source: ..\win32\magick-modules\gif.dll; DestDir: {app}\magick-modules
103+
Source: ..\win32\magick-modules\jpeg.dll; DestDir: {app}\magick-modules
104+
Source: ..\win32\magick-modules\png.dll; DestDir: {app}\magick-modules
105+
Source: ..\win32\magick-modules\svg.dll; DestDir: {app}\magick-modules
106+
107+
108+
109+
110+
[Icons]
111+
Name: {group}\FUPPES; Filename: {app}\fuppes-win.exe; IconIndex: 0
112+
Name: {group}\{cm:UninstallProgram,FUPPES}; Filename: {uninstallexe}
113+
Name: {userdesktop}\FUPPES; Filename: {app}\fuppes-win.exe; Tasks: desktopicon; IconIndex: 0
114+
Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\FUPPES; Filename: {app}\fuppes-win.exe; Tasks: quicklaunchicon; Languages: ; IconIndex: 0
115+
Name: {group}\Edit configuration; Filename: {userappdata}\FUPPES\fuppes.cfg; Tasks: ; Languages:
116+
Name: {group}\FUPPES (command line); Filename: {app}\fuppes.exe; IconIndex: 0
117+
118+
[Run]
119+
Filename: {app}\fuppes.exe; Description: {cm:LaunchProgram,Free UPnP Entertainment Service}; Flags: nowait postinstall skipifsilent unchecked; Tasks: ; Languages:
120+
121+
[CustomMessages]
122+
MiscPlugins=miscellaneous plugins
123+
MetadataPlugins=metadata plugins
124+
AudioDecoderPlugins=audio decoder plugins
125+
AudioEncoderPlugins=audio encoder plugins
126+
TranscoderPlugins=transcoding plugins

‎src/plugins/Makefile.am

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,13 @@ libmetadata_libavformat_la_SOURCES = \
6565

6666
libmetadata_libavformat_la_CFLAGS = \
6767
$(LIBAVFORMAT_CFLAGS) \
68-
$(LIBAVCODEC_CFLAGS)
68+
$(LIBAVCODEC_CFLAGS) \
69+
$(LIBAVUTIL_CFLAGS)
6970

7071
libmetadata_libavformat_la_LDFLAGS = \
7172
$(LIBAVFORMAT_LIBS) \
72-
$(LIBAVCODEC_LIBS)
73+
$(LIBAVCODEC_LIBS) \
74+
$(LIBAVUTIL_LIBS)
7375

7476
endif
7577

0 commit comments

Comments
 (0)