[xiph-commits] r17310 - in trunk/oggdsf: . build/NSIS/Release src/lib/helper/common
cristianadam at svn.xiph.org
cristianadam at svn.xiph.org
Mon Jun 28 12:05:55 PDT 2010
Author: cristianadam
Date: 2010-06-28 12:05:54 -0700 (Mon, 28 Jun 2010)
New Revision: 17310
Modified:
trunk/oggdsf/BUILD.txt
trunk/oggdsf/COPYRIGHTS
trunk/oggdsf/COPYRIGHTS.rtf
trunk/oggdsf/README
trunk/oggdsf/build/NSIS/Release/macros.nsi
trunk/oggdsf/build/NSIS/Release/opencodecs.nsi
trunk/oggdsf/src/lib/helper/common/util.h
Log:
Installer fixes.
Added Google reference to COPYRIGHTS files.
Moved settings configuration to CSIDL_COMMON_APPDATA instead of CSIDL_APPDATA.
Modified: trunk/oggdsf/BUILD.txt
===================================================================
--- trunk/oggdsf/BUILD.txt 2010-06-28 05:43:49 UTC (rev 17309)
+++ trunk/oggdsf/BUILD.txt 2010-06-28 19:05:54 UTC (rev 17310)
@@ -1,4 +1,4 @@
-Information for builds after 0.82
+Information for builds after 0.83
=================================
Visual Studio Standard (or better) version 2005 or 2008 is needed
@@ -6,8 +6,12 @@
The Netwide Assembler (NASM) is used to build the FLAC assembly
files. Get version 2.0.7 or later from http://www.nasm.us/
-nasm.exe is assumed to be in path.
+nasm.exe is assumed to be located in PATH environment variable.
+YASM is used to build the VP8 assembly files. Getversion 1.0.1 or later
+from http://www.tortall.net/projects/yasm/. yasm.exe is assumed to
+be located in PATH environment variable.
+
NSIS (Nullsoft Scriptable Install System) Unicode is used to make the
setup files. Get version 2.45 or later from http://www.scratchpaper.com/
Modified: trunk/oggdsf/COPYRIGHTS
===================================================================
--- trunk/oggdsf/COPYRIGHTS 2010-06-28 05:43:49 UTC (rev 17309)
+++ trunk/oggdsf/COPYRIGHTS 2010-06-28 19:05:54 UTC (rev 17310)
@@ -167,6 +167,7 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
------------------------------------------------------------------------
*** libCMMLParse
*** libCMMLTags
@@ -242,9 +243,7 @@
*** DNPlay
*** iOCE
-
-Copyright (C) 2008 - 2010 Cristian Adam
-
+Copyright (C) 2008-2010 Cristian Adam
Copyright (C) 2003-2005 Zentaro Kavanagh
Redistribution and use in source and binary forms, with or without
@@ -274,3 +273,38 @@
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------
+
+*** libvpx
+*** webmdshow
+
+Copyright (c) 2010, Google Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
+ * Neither the name of Google nor the names of its contributors may
+ be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+------------------------------------------------------------------------
\ No newline at end of file
Modified: trunk/oggdsf/COPYRIGHTS.rtf
===================================================================
--- trunk/oggdsf/COPYRIGHTS.rtf 2010-06-28 05:43:49 UTC (rev 17309)
+++ trunk/oggdsf/COPYRIGHTS.rtf 2010-06-28 19:05:54 UTC (rev 17310)
@@ -2,7 +2,7 @@
{\*\generator Msftedit 5.41.15.1515;}\viewkind4\uc1\pard\nowidctlpar\lang1033\f0\fs16 Various individuals and organisations hold copyrights on portions of this\par
software including \lang1048\f1 Cristian Adam, \lang1033\f0 Zentaro Kavanagh, Commonwealth Scientific \par
and\lang1048\f1 \lang1033\f0 Industrial Research Organisation (CSIRO) Australia, Josh Coalson,\par
-Xiph.org Foundation, and Jean-Marc Valin.\par
+Xiph.org Foundation, Jean-Marc Valin\lang1048\f1 , and Google.\lang1033\f0\par
\par
The full text of these copyrights and software licenses appears below.\par
\par
@@ -252,11 +252,9 @@
*** DNPlay\par
*** iOCE\par
\par
+Copyright (C) 2008-2010 Cristian Adam\par
+Copyright (C) 2003-2005 Zentaro Kavanagh\par
\par
-Copyright (C) 2008 - 2010 Cristian Adam\par
-\par
-Copyright (C) 2003\lang1048\f1 -\lang1033\f0 200\lang1048\f1 5\lang1033\f0 Zentaro Kavanagh\par
-\par
Redistribution and use in source and binary forms, with or without\par
modification, are permitted provided that the following conditions\par
are met:\par
@@ -283,6 +281,41 @@
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING\par
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\par
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\par
+\par
------------------------------------------------------------------------\par
+*** libvpx\par
+*** webmdshow\par
+\par
+Copyright (c) 2010, Google Inc. All rights reserved.\par
+\par
+Redistribution and use in source and binary forms, with or without\par
+modification, are permitted provided that the following conditions are\par
+met:\par
+\par
+ * Redistributions of source code must retain the above copyright\par
+ notice, this list of conditions and the following disclaimer.\par
+\par
+ * Redistributions in binary form must reproduce the above copyright\par
+ notice, this list of conditions and the following disclaimer in\par
+ the documentation and/or other materials provided with the\par
+ distribution.\par
+\par
+ * Neither the name of Google nor the names of its contributors may\par
+ be used to endorse or promote products derived from this software\par
+ without specific prior written permission.\par
+\par
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\par
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\par
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\par
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\par
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\par
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\par
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\par
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\par
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\par
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\par
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\par
+\par
+------------------------------------------------------------------------\par
}
\ No newline at end of file
Modified: trunk/oggdsf/README
===================================================================
--- trunk/oggdsf/README 2010-06-28 05:43:49 UTC (rev 17309)
+++ trunk/oggdsf/README 2010-06-28 19:05:54 UTC (rev 17310)
@@ -1,8 +1,8 @@
-Directshow Filters for Ogg Vorbis, Speex, Theora and FLAC
+Directshow Filters for Ogg Vorbis, Speex, Theora, FLAC, and WebM
The aim of this project is to provide the most complete implementation of the Xiph.org codecs
for Windows and DirectShow. This includes decoders and encoders for all the Xiph.org formats as
-well as Annodex.
+well as Annodex.
It is released under a BSD license, so they can be used by both open-source and commercial
applications.
Modified: trunk/oggdsf/build/NSIS/Release/macros.nsi
===================================================================
--- trunk/oggdsf/build/NSIS/Release/macros.nsi 2010-06-28 05:43:49 UTC (rev 17309)
+++ trunk/oggdsf/build/NSIS/Release/macros.nsi 2010-06-28 19:05:54 UTC (rev 17310)
@@ -50,26 +50,30 @@
;--------------------------------------------------------------------------------------------------------------------------------------------------------------------------
!macro RegisterCOM file
!define LIBRARY_COM
- RegDLL "${file}"
+ RegDLL "$INSTDIR\${file}"
!undef LIBRARY_COM
IfErrors 0 +2
- ExecWait '$SYSDIR\regsvr32.exe "/s" "$INSTDIR\${file}"'
+ ExecWait '$SYSDIR\regsvr32.exe /s "$INSTDIR\${file}"'
${If} ${RunningX64}
- ExecWait '$SYSDIR\regsvr32.exe "/s" "$INSTDIR\x64\${file}"'
+ ${EnableX64FSRedirection}
+ ExecWait '$SYSDIR\regsvr32.exe /s "$INSTDIR\x64\${file}"'
+ ${DisableX64FSRedirection}
${EndIf}
!macroend
!define RegisterCOM "!insertmacro RegisterCOM"
!macro UnRegisterCOM file
!define LIBRARY_COM
- UnRegDLL "${file}"
+ UnRegDLL "$INSTDIR\${file}"
!undef LIBRARY_COM
IfErrors 0 +2
- ExecWait '$SYSDIR\regsvr32.exe "/u" "/s" "$INSTDIR\${file}"'
+ ExecWait '$SYSDIR\regsvr32.exe /u /s "$INSTDIR\${file}"'
${If} ${RunningX64}
- ExecWait '$SYSDIR\regsvr32.exe "/u" "/s" "$INSTDIR\x64\${file}"'
+ ${EnableX64FSRedirection}
+ ExecWait '$SYSDIR\regsvr32.exe /u /s "$INSTDIR\x64\${file}"'
+ ${DisableX64FSRedirection}
${EndIf}
!macroend
!define UnRegisterCOM "!insertmacro UnRegisterCOM"
@@ -403,6 +407,27 @@
!define UnRegisterAxPlayerXmlNamespace "!insertmacro UnRegisterAxPlayerXmlNamespace"
;--------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+!macro RegisterUserAgentString OpenCodecsInfo
+ SetRegView 32
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Internet Settings\5.0\User Agent\Post Platform" "${OpenCodecsInfo}" ""
+ ${If} ${RunningX64}
+ SetRegView 64
+ WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Internet Settings\5.0\User Agent\Post Platform" "${OpenCodecsInfo}" ""
+ ${EndIf}
+!macroend
+!define RegisterUserAgentString "!insertmacro RegisterUserAgentString"
+
+!macro UnRegisterUserAgentString OpenCodecsInfo
+ SetRegView 32
+ DeleteRegValue HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Internet Settings\5.0\User Agent\Post Platform" "${OpenCodecsInfo}"
+ ${If} ${RunningX64}
+ SetRegView 64
+ DeleteRegValue HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Internet Settings\5.0\User Agent\Post Platform" "${OpenCodecsInfo}"
+ ${EndIf}
+!macroend
+!define UnRegisterUserAgentString "!insertmacro UnRegisterUserAgentString"
+
+;--------------------------------------------------------------------------------------------------------------------------------------------------------------------------
!macro AddMediaPlayerDesc_Internal Descriptions Types MuiDescription
; Get the next file description entry
StrCpy $0 0
Modified: trunk/oggdsf/build/NSIS/Release/opencodecs.nsi
===================================================================
--- trunk/oggdsf/build/NSIS/Release/opencodecs.nsi 2010-06-28 05:43:49 UTC (rev 17309)
+++ trunk/oggdsf/build/NSIS/Release/opencodecs.nsi 2010-06-28 19:05:54 UTC (rev 17310)
@@ -183,6 +183,10 @@
SetDetailsPrint textonly
DetailPrint "Copying Files ..."
SetDetailsPrint listonly
+
+ ${If} ${RunningX64}
+ CreateDirectory "$INSTDIR\x64"
+ ${EndIf}
; Runtime libraries from visual studio
${AddVisualStudioRuntime}
@@ -390,6 +394,7 @@
${RegisterCOM} "AxPlayer.dll"
; Add AxPlayer XMLNamespace registry value
${RegisterAxPlayerXmlNamespace}
+ ${RegisterUserAgentString} "${PRODUCT_NAME} ${PRODUCT_VERSION}"
${MementoSectionEnd}
;--------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -603,6 +608,7 @@
; Delete the AxPlayer XMLNamespace registry value
${UnRegisterAxPlayerXmlNamespace}
+ ${UnRegisterUserAgentString} "${PRODUCT_NAME} ${PRODUCT_VERSION}"
!insertmacro MUI_STARTMENU_GETFOLDER "Application" $ICONS_GROUP
@@ -661,6 +667,9 @@
; Need to change the working directory to something else (anything) besides
; the output directory, so we can rmdir it
SetOutPath "$TEMP"
+ ${If} ${RunningX64}
+ RMDir "$INSTDIR\x64"
+ ${EndIf}
RMDir "$INSTDIR"
; Remove the parent directory (but only if it's empty)
Modified: trunk/oggdsf/src/lib/helper/common/util.h
===================================================================
--- trunk/oggdsf/src/lib/helper/common/util.h 2010-06-28 05:43:49 UTC (rev 17309)
+++ trunk/oggdsf/src/lib/helper/common/util.h 2010-06-28 19:05:54 UTC (rev 17310)
@@ -71,10 +71,10 @@
std::wstring configLocation;
configLocation.resize(MAX_PATH);
- ::SHGetSpecialFolderPath(0, &*configLocation.begin(), CSIDL_APPDATA, false);
+ ::SHGetSpecialFolderPath(0, &*configLocation.begin(), CSIDL_COMMON_APPDATA, false);
configLocation.resize(wcslen(configLocation.c_str()));
- configLocation += L"\\Xiph.Org\\Ogg Codecs";
+ configLocation += L"\\Xiph.Org\\Open Codecs";
return configLocation;
}
More information about the commits
mailing list