[xiph-commits] r16948 - in trunk/oggdsf: build/oggcodecs_wm5 src/lib/codecs/theora/filters/dsfTheoraDecoder

cristianadam at svn.xiph.org cristianadam at svn.xiph.org
Wed Mar 3 15:06:07 PST 2010 

Author: cristianadam
Date: 2010-03-03 15:06:07 -0800 (Wed, 03 Mar 2010)
New Revision: 16948

Added:
   trunk/oggdsf/build/oggcodecs_wm5/build.cmd
Modified:
   trunk/oggdsf/build/oggcodecs_wm5/oggcodecs_wm5.sln
   trunk/oggdsf/build/oggcodecs_wm5/oggcodecs_wm5.vddproj
   trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeFilter.cpp
Log:
Windows Mobile build fixes. Added packaging script.

Added: trunk/oggdsf/build/oggcodecs_wm5/build.cmd
===================================================================
--- trunk/oggdsf/build/oggcodecs_wm5/build.cmd	                        (rev 0)
+++ trunk/oggdsf/build/oggcodecs_wm5/build.cmd	2010-03-03 23:06:07 UTC (rev 16948)
@@ -0,0 +1,61 @@
+::---------------------------------------------------------------------------------------------------------------------------------
+:: Copyright (C)  2010 Cristian Adam
+::---------------------------------------------------------------------------------------------------------------------------------
+
+set COMPILER=VS2005
+set PLATFORM=windows mobile 5.0 smartphone sdk (armv4i)
+set SUFFIX=wm5
+
+:: Get revision number
+svn info http://svn.xiph.org/trunk/oggdsf | findstr Revision > revision_text
+set /p SVN_REVISION_FULL=<revision_text
+set SVN_REVISION=%SVN_REVISION_FULL:~-5%
+del revision_text
+
+set PRODUCT_VERSION=0.82.%SVN_REVISION%
+set OGGCODECS_ROOT_DIR=..\..
+
+ at set FILTERS=dsfNativeFLACSource dsfOggDemux2
+ at set FILTERS=%FILTERS% dsfSpeexDecoder dsfTheoraDecoder
+ at set FILTERS=%FILTERS% dsfVorbisDecoder wmpinfo
+
+call:copy_binaries
+call:make_installer
+
+goto:eof
+
+::---------------------------------------------------------------------------------------------------------------------------------
+
+:make_installer
+
+for %%i in (%FILTERS%) do (
+signtool sign /a /t http://time.certum.pl/ bin\%%i.dll
+)
+
+mkdir Release
+devenv oggcodecs_wm5.sln /Rebuild "Release"
+move Release\oggcodecs_wm5.CAB oggcodecs_%PRODUCT_VERSION%-wm5.cab
+
+signtool sign /a /t http://time.certum.pl/  oggcodecs_%PRODUCT_VERSION%-%SUFFIX%.cab
+"%ProgramFiles%\7-zip\7z.exe" a oggcodecs_%PRODUCT_VERSION%_pdbs-%SUFFIX%.7z pdb\*
+
+goto:eof
+::---------------------------------------------------------------------------------------------------------------------------------
+
+:copy_binaries
+
+rmdir /s /q bin
+mkdir bin
+
+for %%i in (%FILTERS%) do (
+copy "%OGGCODECS_ROOT_DIR%\sln\oggdsf_%COMPILER%\%PLATFORM%\Release\%%i.dll" bin\
+)
+
+rmdir /s /q pdb
+mkdir pdb
+
+for %%i in (%FILTERS%) do (
+copy "%OGGCODECS_ROOT_DIR%\sln\oggdsf_%COMPILER%\%PLATFORM%\Release\%%i.pdb" pdb\
+)
+
+goto:eof

Modified: trunk/oggdsf/build/oggcodecs_wm5/oggcodecs_wm5.sln
===================================================================
--- trunk/oggdsf/build/oggcodecs_wm5/oggcodecs_wm5.sln	2010-03-03 22:04:44 UTC (rev 16947)
+++ trunk/oggdsf/build/oggcodecs_wm5/oggcodecs_wm5.sln	2010-03-03 23:06:07 UTC (rev 16948)
@@ -5,20 +5,14 @@
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug_WM5_PPC_ARM|Default = Debug_WM5_PPC_ARM|Default
 		Debug|Default = Debug|Default
-		Release_WM5_PPC_ARM|Default = Release_WM5_PPC_ARM|Default
 		Release|Default = Release|Default
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{EC9174C6-27C1-4F10-A378-D04533F1E2BC}.Debug_WM5_PPC_ARM|Default.ActiveCfg = Debug_WM5_PPC_ARM
-		{EC9174C6-27C1-4F10-A378-D04533F1E2BC}.Debug_WM5_PPC_ARM|Default.Build.0 = Debug_WM5_PPC_ARM
-		{EC9174C6-27C1-4F10-A378-D04533F1E2BC}.Debug|Default.ActiveCfg = Debug
-		{EC9174C6-27C1-4F10-A378-D04533F1E2BC}.Debug|Default.Build.0 = Debug_WM5_PPC_ARM
-		{EC9174C6-27C1-4F10-A378-D04533F1E2BC}.Release_WM5_PPC_ARM|Default.ActiveCfg = Release_WM5_PPC_ARM
-		{EC9174C6-27C1-4F10-A378-D04533F1E2BC}.Release_WM5_PPC_ARM|Default.Build.0 = Release_WM5_PPC_ARM
+		{EC9174C6-27C1-4F10-A378-D04533F1E2BC}.Debug|Default.ActiveCfg = Release
+		{EC9174C6-27C1-4F10-A378-D04533F1E2BC}.Debug|Default.Build.0 = Release
 		{EC9174C6-27C1-4F10-A378-D04533F1E2BC}.Release|Default.ActiveCfg = Release
-		{EC9174C6-27C1-4F10-A378-D04533F1E2BC}.Release|Default.Build.0 = Release_WM5_PPC_ARM
+		{EC9174C6-27C1-4F10-A378-D04533F1E2BC}.Release|Default.Build.0 = Release
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: trunk/oggdsf/build/oggcodecs_wm5/oggcodecs_wm5.vddproj
===================================================================
--- trunk/oggdsf/build/oggcodecs_wm5/oggcodecs_wm5.vddproj	2010-03-03 22:04:44 UTC (rev 16947)
+++ trunk/oggdsf/build/oggcodecs_wm5/oggcodecs_wm5.vddproj	2010-03-03 23:06:07 UTC (rev 16948)
@@ -63,18 +63,6 @@
         "CertificateHash" = "8:"
         "TimeStampServer" = "8:"
         }
-        "Debug_WM5_PPC_ARM"
-        {
-        "DisplayName" = "8:Debug_WM5_PPC_ARM"
-        "IsDebugOnly" = "11:FALSE"
-        "IsReleaseOnly" = "11:FALSE"
-        "OutputFilename" = "8:Debug_WM5_PPC_ARM\\oggcodecs_wm5.cab"
-        "PackageFileSize" = "3:-2147483648"
-        "CabType" = "3:1"
-        "SignOutput" = "11:FALSE"
-        "CertificateHash" = "8:"
-        "TimeStampServer" = "8:"
-        }
         "Release"
         {
         "DisplayName" = "8:Release"
@@ -83,22 +71,10 @@
         "OutputFilename" = "8:Release\\oggcodecs_wm5.cab"
         "PackageFileSize" = "3:-2147483648"
         "CabType" = "3:1"
-        "SignOutput" = "11:TRUE"
+        "SignOutput" = "11:FALSE"
         "CertificateHash" = "8:75E588AA04977B574EBA1090E44CFD9F6BC8A5F5"
         "TimeStampServer" = "8:"
         }
-        "Release_WM5_PPC_ARM"
-        {
-        "DisplayName" = "8:Release_WM5_PPC_ARM"
-        "IsDebugOnly" = "11:FALSE"
-        "IsReleaseOnly" = "11:FALSE"
-        "OutputFilename" = "8:Release_WM5_PPC_ARM\\oggcodecs_wm5.cab"
-        "PackageFileSize" = "3:-2147483648"
-        "CabType" = "3:1"
-        "SignOutput" = "11:FALSE"
-        "CertificateHash" = "8:"
-        "TimeStampServer" = "8:"
-        }
     }
     "Deployable"
     {

Modified: trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeFilter.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeFilter.cpp	2010-03-03 22:04:44 UTC (rev 16947)
+++ trunk/oggdsf/src/lib/codecs/theora/filters/dsfTheoraDecoder/TheoraDecodeFilter.cpp	2010-03-03 23:06:07 UTC (rev 16948)
@@ -38,6 +38,10 @@
 #include "TheoraDecodeFilter.h"
 #include "common/util.h"
 
+#ifdef WINCE
+const GUID MEDIASUBTYPE_AYUV = { 0x56555941, 0x0000, 0x0010, { 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 } };
+#endif
+
 //COM Factory Template
 CFactoryTemplate g_Templates[] = 
 {

More information about the commits mailing list