diff --git a/0ad-licensecheck.txt b/0ad-licensecheck.txt index 99b9c14..7cf65ac 100644 --- a/0ad-licensecheck.txt +++ b/0ad-licensecheck.txt @@ -502,6 +502,156 @@ ./libraries/fcollada/include/FMath/FMColor.h: MIT/X11 (BSD like) ./libraries/fcollada/include/FMath/FMAllocator.h: MIT/X11 (BSD like) ./libraries/fcollada/include/FMath/FMAngleAxis.h: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvcore/DefsVcWin32.h: *No copyright* UNKNOWN +./libraries/nvtt/src/src/nvcore/TextWriter.h: *No copyright* Public domain +./libraries/nvtt/src/src/nvcore/Library.cpp: *No copyright* UNKNOWN +./libraries/nvtt/src/src/nvcore/Tokenizer.h: *No copyright* Public domain +./libraries/nvtt/src/src/nvcore/TextWriter.cpp: *No copyright* Public domain +./libraries/nvtt/src/src/nvcore/Radix.cpp: *No copyright* UNKNOWN +./libraries/nvtt/src/src/nvcore/Debug.h: *No copyright* Public domain +./libraries/nvtt/src/src/nvcore/Containers.h: *No copyright* Public domain +./libraries/nvtt/src/src/nvcore/Stream.h: *No copyright* Public domain +./libraries/nvtt/src/src/nvcore/BitArray.h: *No copyright* Public domain +./libraries/nvtt/src/src/nvcore/poshlib/posh.h: BSD (2 clause) +./libraries/nvtt/src/src/nvcore/poshlib/posh.c: BSD (2 clause) +./libraries/nvtt/src/src/nvcore/StdStream.h: *No copyright* UNKNOWN +./libraries/nvtt/src/src/nvcore/Radix.h: *No copyright* UNKNOWN +./libraries/nvtt/src/src/nvcore/nvcore.h: *No copyright* Public domain +./libraries/nvtt/src/src/nvcore/TextReader.cpp: *No copyright* Public domain +./libraries/nvtt/src/src/nvcore/Memory.h: *No copyright* Public domain +./libraries/nvtt/src/src/nvcore/Memory.cpp: *No copyright* Public domain +./libraries/nvtt/src/src/nvcore/StrLib.h: *No copyright* Public domain +./libraries/nvtt/src/src/nvcore/Debug.cpp: *No copyright* Public domain +./libraries/nvtt/src/src/nvcore/StrLib.cpp: Public domain +./libraries/nvtt/src/src/nvcore/Prefetch.h: *No copyright* Public domain +./libraries/nvtt/src/src/nvcore/DefsGnucWin32.h: *No copyright* UNKNOWN +./libraries/nvtt/src/src/nvcore/Library.h: *No copyright* Public domain +./libraries/nvtt/src/src/nvcore/Ptr.h: *No copyright* Public domain +./libraries/nvtt/src/src/nvcore/TextReader.h: *No copyright* Public domain +./libraries/nvtt/src/src/nvcore/DefsGnucDarwin.h: *No copyright* UNKNOWN +./libraries/nvtt/src/src/nvcore/Tokenizer.cpp: *No copyright* Public domain +./libraries/nvtt/src/src/nvcore/DefsGnucLinux.h: *No copyright* UNKNOWN +./libraries/nvtt/src/src/nvmath/Basis.h: *No copyright* Public domain +./libraries/nvtt/src/src/nvmath/Plane.cpp: *No copyright* Public domain +./libraries/nvtt/src/src/nvmath/Random.cpp: *No copyright* Public domain +./libraries/nvtt/src/src/nvmath/Color.h: *No copyright* Public domain +./libraries/nvtt/src/src/nvmath/Triangle.cpp: *No copyright* Public domain +./libraries/nvtt/src/src/nvmath/nvmath.h: *No copyright* Public domain +./libraries/nvtt/src/src/nvmath/Random.h: *No copyright* Public domain +./libraries/nvtt/src/src/nvmath/SphericalHarmonic.cpp: *No copyright* Public domain +./libraries/nvtt/src/src/nvmath/SphericalHarmonic.h: *No copyright* Public domain +./libraries/nvtt/src/src/nvmath/Matrix.h: *No copyright* Public domain +./libraries/nvtt/src/src/nvmath/TriBox.cpp: *No copyright* UNKNOWN +./libraries/nvtt/src/src/nvmath/Quaternion.h: *No copyright* Public domain +./libraries/nvtt/src/src/nvmath/Box.h: *No copyright* Public domain +./libraries/nvtt/src/src/nvmath/Montecarlo.cpp: *No copyright* Public domain +./libraries/nvtt/src/src/nvmath/Triangle.h: *No copyright* Public domain +./libraries/nvtt/src/src/nvmath/Basis.cpp: *No copyright* Public domain +./libraries/nvtt/src/src/nvmath/Vector.h: *No copyright* Public domain +./libraries/nvtt/src/src/nvmath/Plane.h: *No copyright* Public domain +./libraries/nvtt/src/src/nvmath/Montecarlo.h: *No copyright* Public domain +./libraries/nvtt/src/src/nvimage/BlockDXT.h: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvimage/HoleFilling.cpp: *No copyright* Public domain +./libraries/nvtt/src/src/nvimage/NormalMipmap.cpp: *No copyright* Public domain +./libraries/nvtt/src/src/nvimage/nvimage.h: *No copyright* Public domain +./libraries/nvtt/src/src/nvimage/ImageIO.cpp: *No copyright* Public domain +./libraries/nvtt/src/src/nvimage/ConeMap.cpp: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvimage/BlockDXT.cpp: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvimage/Quantize.cpp: *No copyright* Public domain +./libraries/nvtt/src/src/nvimage/ColorBlock.cpp: *No copyright* Public domain +./libraries/nvtt/src/src/nvimage/NormalMap.cpp: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvimage/TgaFile.h: *No copyright* Public domain +./libraries/nvtt/src/src/nvimage/Quantize.h: *No copyright* Public domain +./libraries/nvtt/src/src/nvimage/NormalMap.h: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvimage/Filter.h: *No copyright* Public domain +./libraries/nvtt/src/src/nvimage/Image.h: *No copyright* Public domain +./libraries/nvtt/src/src/nvimage/ColorBlock.h: *No copyright* Public domain +./libraries/nvtt/src/src/nvimage/DirectDrawSurface.cpp: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvimage/Image.cpp: *No copyright* Public domain +./libraries/nvtt/src/src/nvimage/FloatImage.h: *No copyright* Public domain +./libraries/nvtt/src/src/nvimage/PsdFile.h: *No copyright* Public domain +./libraries/nvtt/src/src/nvimage/ConeMap.h: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvimage/NormalMipmap.h: *No copyright* Public domain +./libraries/nvtt/src/src/nvimage/ImageIO.h: *No copyright* Public domain +./libraries/nvtt/src/src/nvimage/FloatImage.cpp: *No copyright* Public domain +./libraries/nvtt/src/src/nvimage/Filter.cpp: *No copyright* Public domain +./libraries/nvtt/src/src/nvimage/DirectDrawSurface.h: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvimage/HoleFilling.h: *No copyright* Public domain +./libraries/nvtt/src/src/nvimage/PixelFormat.h: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/CompressionOptions.cpp: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/CompressDXT.h: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/InputOptions.cpp: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/Compressor.h: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/CompressRGB.h: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/OptimalCompressDXT.h: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/CompressRGB.cpp: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/OutputOptions.cpp: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/QuickCompressDXT.cpp: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/CompressDXT.cpp: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/nvtt.h: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/nvtt.cpp: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/cuda/CudaCompressDXT.cpp: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/cuda/CudaUtils.cpp: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/cuda/CudaMath.h: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/cuda/CudaCompressDXT.h: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/cuda/Bitmaps.h: *No copyright* UNKNOWN +./libraries/nvtt/src/src/nvtt/cuda/CudaUtils.h: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/CompressionOptions.h: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/tests/filtertest.cpp: *No copyright* UNKNOWN +./libraries/nvtt/src/src/nvtt/tests/ctest.c: *No copyright* UNKNOWN +./libraries/nvtt/src/src/nvtt/tools/cmdline.h: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/tools/imgdiff.cpp: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/tools/configdialog.cpp: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/tools/resize.cpp: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/tools/main.cpp: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/tools/assemble.cpp: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/tools/configdialog.h: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/tools/decompress.cpp: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/tools/compress.cpp: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/tools/ddsinfo.cpp: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/tools/benchmark.cpp: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/QuickCompressDXT.h: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/InputOptions.h: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/OptimalCompressDXT.cpp: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/Compressor.cpp: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/nvtt_wrapper.cpp: *No copyright* UNKNOWN +./libraries/nvtt/src/src/nvtt/squish/simd_ve.h: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/squish/alpha.h: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/squish/colourset.h: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/squish/squish.cpp: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/squish/simd.h: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/squish/singlechannelfit.cpp: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/squish/rangefit.h: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/squish/extra/squishgen.cpp: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/squish/extra/squishpng.cpp: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/squish/extra/squishtest.cpp: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/squish/clusterfit.cpp: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/squish/colourfit.cpp: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/squish/squish.h: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/squish/maths.h: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/squish/weightedclusterfit.h: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/squish/weightedclusterfit.cpp: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/squish/clusterfit.h: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/squish/singlecolourfit.cpp: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/squish/fastclusterfit.cpp: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/squish/simd_3dnow.h: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/squish/fastclusterfit.h: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/squish/colourset.cpp: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/squish/alpha.cpp: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/squish/maths.cpp: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/squish/config.h: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/squish/singlecolourfit.h: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/squish/singlechannelfit.h: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/squish/simd_sse.h: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/squish/colourblock.cpp: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/squish/rangefit.cpp: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/squish/colourfit.h: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/squish/colourblock.h: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/nvtt_wrapper.h: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/OutputOptions.h: MIT/X11 (BSD like) +./libraries/nvtt/src/src/nvtt/SingleColorLookup.h: *No copyright* UNKNOWN +./libraries/nvtt/include/nvtt/nvtt.h: MIT/X11 (BSD like) +./libraries/nvtt/build.sh: *No copyright* UNKNOWN ./libraries/enet/src/protocol.c: *No copyright* UNKNOWN ./libraries/enet/src/callbacks.c: *No copyright* UNKNOWN ./libraries/enet/src/ltmain.sh: GPL (v2 or later) GENERATED FILE diff --git a/0ad.6 b/0ad.6 index d980c6f..f37dec5 100644 --- a/0ad.6 +++ b/0ad.6 @@ -1,4 +1,4 @@ -.TH 0AD "1" "Dec 17 2012" "0ad 0.0.12" "User Commands" +.TH 0AD "1" "Dec 16 2012" "0ad 0.0.12" "User Commands" .SH NAME 0ad \- manual page for 0ad 0.0.12 @@ -126,7 +126,7 @@ store runtime game data in root data directory .TP \fB\-ooslog\fR dumps simulation state in binary and ASCII representations each turn, -files created in sim_log within the game's log folder. NOTE: game will +files created in sim_log within the game's log folder. \fBNOTE\fR: game will run much slower with this option! .TP \fB-serializationtest\fR diff --git a/0ad.spec b/0ad.spec index 328486f..b336585 100644 --- a/0ad.spec +++ b/0ad.spec @@ -14,10 +14,8 @@ # https://bugzilla.redhat.com/show_bug.cgi?id=818401#c46 # http://trac.wildfiregames.com/ticket/1682 -# conditionals left for the sake of users building from source, but -# nvtt (due to s3tc patented code) is not supported and not built. -%global with_system_nvtt 0 -%global without_nvtt 1 +%global with_system_nvtt 1 +%global without_nvtt 0 %if 0%{?fedora} <= 16 %global with_system_enet 0 @@ -27,7 +25,7 @@ Name: 0ad Version: 0.0.12 -Release: 1%{?dist} +Release: 2%{?dist} # BSD License: # build/premake/* # libraries/valgrind/* (not built/used) @@ -138,6 +136,10 @@ hobbyist game developers, since 2001. %patch2 -p1 %endif +%if %{with_system_nvtt} +rm -fr libraries/nvtt +%endif + #----------------------------------------------------------------------- %build export CFLAGS="%{optflags}" @@ -228,6 +230,12 @@ export STRIP=/bin/true %{_mandir}/man6/*.6* %changelog +* Wed Dec 19 2012 pcpa - 0.0.11-2 +- Enable build with system nvtt as it is now approved in Fedora (#823096) +- Correct release date in manual page +- Minor consistency correction in manual page formatting +- Regenerate the licensecheck text file to match pristine tarball + * Tue Dec 18 2012 pcpa - 0.0.11-1 - Update to latest upstream release - Remove no longer required gamin patch diff --git a/sources b/sources index f0494f1..de67806 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ 0ff92fb2b22b5384067cdd88b89e5450 0ad-0.0.12-alpha-unix-build.tar.xz -9de96cd133597e3c1a7f759e91787288 0ad-0.0.12-alpha-unix-data.tar.xz