Changeset 133 for smplayer/vendor/current/zlib/contrib

Timestamp:

Oct 24, 2012, 7:56:20 PM (13 years ago)

Author:

Silvan Scherrer

Message:

SMplayer: update vendor to 0.8.1

Location:

smplayer/vendor/current/zlib

Files:

• . (moved) (moved from smplayer/vendor/current/zlib-1.2.6 )
• contrib/delphi/ZLib.pas (modified) (1 diff)
• contrib/dotzlib/DotZLib/UnitTests.cs (modified) (1 diff)
• contrib/infback9/inftree9.c (modified) (2 diffs)
• contrib/minizip/Makefile.am (modified) (2 diffs)
• contrib/minizip/configure.ac (modified) (2 diffs)
• contrib/minizip/zip.c (modified) (1 diff)
• contrib/pascal/zlibpas.pas (modified) (1 diff)
• contrib/vstudio/readme.txt (modified) (4 diffs)
• contrib/vstudio/vc10/testzlibdll.vcxproj (modified) (6 diffs)
• contrib/vstudio/vc10/zlib.rc (modified) (2 diffs)
• contrib/vstudio/vc10/zlibvc.def (modified) (2 diffs)
• contrib/vstudio/vc10/zlibvc.vcxproj (modified) (5 diffs)
• contrib/vstudio/vc9/zlib.rc (modified) (2 diffs)
• contrib/vstudio/vc9/zlibvc.def (modified) (2 diffs)

smplayer/vendor/current/zlib/contrib/delphi/ZLib.pas

@@ -153 +153 @@
 
 const
-  zlib_version = '1.2.6';
+  zlib_version = '1.2.7';
 
 type

smplayer/vendor/current/zlib/contrib/dotzlib/DotZLib/UnitTests.cs

@@ -157 +157 @@
         {
             Info info = new Info();
-            Assert.AreEqual("1.2.6", Info.Version);
+            Assert.AreEqual("1.2.7", Info.Version);
             Assert.AreEqual(32, info.SizeOfUInt);
             Assert.AreEqual(32, info.SizeOfULong);

smplayer/vendor/current/zlib/contrib/infback9/inftree9.c

@@ -10 +10 @@
 
 const char inflate9_copyright[] =
-   " inflate9 1.2.6 Copyright 1995-2012 Mark Adler ";
+   " inflate9 1.2.7 Copyright 1995-2012 Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
@@ -65 +65 @@
         128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129,
         130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132,
-        133, 133, 133, 133, 144, 203, 69};
+        133, 133, 133, 133, 144, 78, 68};
     static const unsigned short dbase[32] = { /* Distance codes 0..31 base */
         1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,

smplayer/vendor/current/zlib/contrib/minizip/Makefile.am

@@ -11 +11 @@
 AM_LDFLAGS = -L$(zlib_top_builddir)
 
+if WIN32
+iowin32_src = iowin32.c
+iowin32_h = iowin32.h
+endif
+
 libminizip_la_SOURCES = \
         ioapi.c \
         mztools.c \
         unzip.c \
-        zip.c
+        zip.c \
+        ${iowin32_src}
 
 libminizip_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 -lz
@@ -25 +31 @@
         mztools.h \
         unzip.h \
-        zip.h
+        zip.h \
+        ${iowin32_h}
 
 pkgconfigdir = $(libdir)/pkgconfig

smplayer/vendor/current/zlib/contrib/minizip/configure.ac

@@ -2 +2 @@
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([minizip], [1.2.6], [bugzilla.redhat.com])
+AC_INIT([minizip], [1.2.7], [bugzilla.redhat.com])
 AC_CONFIG_SRCDIR([minizip.c])
 AM_INIT_AUTOMAKE([foreign])
@@ -17 +17 @@
 fi
 
+case "${host}" in
+        *-mingw* | mingw*)
+                WIN32="yes"
+                ;;
+        *)
+                ;;
+esac
+AM_CONDITIONAL([WIN32], [test "${WIN32}" = "yes"])
+
+
 AC_SUBST([HAVE_UNISTD_H], [0])
 AC_CHECK_HEADER([unistd.h], [HAVE_UNISTD_H=1], [])

smplayer/vendor/current/zlib/contrib/minizip/zip.c

@@ -1116 +1116 @@
     if ((level==8) || (level==9))
       zi->ci.flag |= 2;
-    if ((level==2))
+    if (level==2)
       zi->ci.flag |= 4;
-    if ((level==1))
+    if (level==1)
       zi->ci.flag |= 6;
     if (password != NULL)

smplayer/vendor/current/zlib/contrib/pascal/zlibpas.pas

@@ -11 +11 @@
 
 const
-  ZLIB_VERSION = '1.2.6';
-  ZLIB_VERNUM  = $1260;
+  ZLIB_VERSION = '1.2.7';
+  ZLIB_VERNUM  = $1270;
 
 type

smplayer/vendor/current/zlib/contrib/vstudio/readme.txt

@@ -1 @@
-Building instructions for the DLL versions of Zlib 1.2.4
+Building instructions for the DLL versions of Zlib 1.2.7
 ========================================================
 
 This directory contains projects that build zlib and minizip using
-Microsoft Visual C++ 9.0/10.0, and Visual C++ .
+Microsoft Visual C++ 9.0/10.0.
 
 You don't need to build these projects yourself. You can download the
@@ -11 +11 @@
 More information can be found at this site.
 
-first compile assembly code by running
-bld_ml64.bat in contrib\masmx64
-bld_ml32.bat in contrib\masmx86
 
 
@@ -21 +18 @@
 --------------------------------------------------------------
 - Uncompress current zlib, including all contrib/* files
-- Open contrib\vstudio\vc9\zlibvc.sln with Microsoft Visual C++ 2008.0
+- Compile assembly code (with Visual Studio Command Prompt) by running:
+   bld_ml64.bat (in contrib\masmx64)
+   bld_ml32.bat (in contrib\masmx86)
+- Open contrib\vstudio\vc9\zlibvc.sln with Microsoft Visual C++ 2008
 - Or run: vcbuild /rebuild contrib\vstudio\vc9\zlibvc.sln "Release|Win32"
 
@@ -27 +27 @@
 --------------------------------------------------------------
 - Uncompress current zlib, including all contrib/* files
-- Open contrib\vstudio\vc10\zlibvc.sln with Microsoft Visual C++ 2010.0
+- Open contrib\vstudio\vc10\zlibvc.sln with Microsoft Visual C++ 2010
 
 

smplayer/vendor/current/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj

@@ -140 +140 @@
     <Link>
       <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
+      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
@@ -170 +170 @@
     <Link>
       <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
+      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
@@ -201 +201 @@
     <Link>
       <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
+      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
@@ -228 +228 @@
     <Link>
       <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
+      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
@@ -258 +258 @@
     <Link>
       <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
+      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
@@ -289 +289 @@
     <Link>
       <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
+      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>

smplayer/vendor/current/zlib/contrib/vstudio/vc10/zlib.rc

@@ -3 +3 @@
 #define IDR_VERSION1  1
 IDR_VERSION1    VERSIONINFO     MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION    1.2.6,1
-  PRODUCTVERSION 1.2.6,1
+  FILEVERSION    1.2.7,0
+  PRODUCTVERSION 1.2.7,0
   FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
   FILEFLAGS     0
@@ -18 +18 @@
     BEGIN
       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",      "1.2.6\0"
+      VALUE "FileVersion",      "1.2.7\0"
       VALUE "InternalName",     "zlib\0"
       VALUE "OriginalFilename", "zlib.dll\0"

smplayer/vendor/current/zlib/contrib/vstudio/vc10/zlibvc.def

@@ -2 +2 @@
 ; zlib data compression and ZIP file I/O library
 
-VERSION         1.24
+VERSION         1.2.7
 
 EXPORTS
@@ -133 +133 @@
 ; zlib1 v1.2.6 added:
         gzgetc_                                 @161
-        gzflags                                 @162
         inflateResetKeep                        @163
-        deflateResetKeep                        @164
+        deflateResetKeep                        @164
+
+; zlib1 v1.2.7 added:
+        gzopen_w                                @165

smplayer/vendor/current/zlib/contrib/vstudio/vc10/zlibvc.vcxproj

@@ -181 +181 @@
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zlibwapi</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">zlibwapi</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">zlibwapi</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">zlibwapi</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">zlibwapi</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">zlibwapi</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -228 +234 @@
       <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
     </Link>
+    <PreBuildEvent>
+      <Command>cd ..\..\masmx86
+bld_ml32.bat</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
@@ -325 +335 @@
       <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
     </Link>
+    <PreBuildEvent>
+      <Command>cd ..\..\masmx86
+bld_ml32.bat</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -369 +383 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
+    <PreBuildEvent>
+      <Command>cd ..\..\contrib\masmx64
+bld_ml64.bat</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
@@ -548 +566 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
+    <PreBuildEvent>
+      <Command>cd ..\..\masmx64
+bld_ml64.bat</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">

smplayer/vendor/current/zlib/contrib/vstudio/vc9/zlib.rc

@@ -3 +3 @@
 #define IDR_VERSION1  1
 IDR_VERSION1    VERSIONINFO     MOVEABLE IMPURE LOADONCALL DISCARDABLE
-  FILEVERSION    1.2.6,1
-  PRODUCTVERSION 1.2.6,1
+  FILEVERSION    1.2.7,0
+  PRODUCTVERSION 1.2.7,0
   FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
   FILEFLAGS     0
@@ -18 +18 @@
     BEGIN
       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
-      VALUE "FileVersion",      "1.2.6\0"
+      VALUE "FileVersion",      "1.2.7\0"
       VALUE "InternalName",     "zlib\0"
       VALUE "OriginalFilename", "zlib.dll\0"

smplayer/vendor/current/zlib/contrib/vstudio/vc9/zlibvc.def

@@ -2 +2 @@
 ; zlib data compression and ZIP file I/O library
 
-VERSION         1.24
+VERSION         1.2.7
 
 EXPORTS
@@ -133 +133 @@
 ; zlib1 v1.2.6 added:
         gzgetc_                                 @161
-        gzflags                                 @162
         inflateResetKeep                        @163
-        deflateResetKeep                        @164
+        deflateResetKeep                        @164
+
+; zlib1 v1.2.7 added:
+        gzopen_w                                @165