diff --git a/.abf.yml b/.abf.yml index b66add7..b025bd9 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - 0ad-0.0.16-alpha-unix-build.tar.xz: 4931b9f6cd68ef131832eeedf8b502b54f204cce + 0ad-0.0.17-alpha-unix-build.tar.xz: a5abc81b450cbb766750ac44a172643389eca3d8 diff --git a/0ad-0.0.17-debug.patch b/0ad-0.0.17-debug.patch new file mode 100644 index 0000000..f378e8e --- /dev/null +++ b/0ad-0.0.17-debug.patch @@ -0,0 +1,70 @@ +diff -urN 0ad-0.0.17-alpha/libraries/source/fcollada/src/Makefile 0ad-0.0.17-alpha-patched/libraries/source/fcollada/src/Makefile +--- 0ad-0.0.17-alpha/libraries/source/fcollada/src/Makefile 2014-09-25 01:39:28.000000000 +1100 ++++ 0ad-0.0.17-alpha-patched/libraries/source/fcollada/src/Makefile 2014-10-14 20:01:50.380309151 +1100 +@@ -9,9 +9,7 @@ + + CXX ?= g++ + CXXFLAGS += -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS) +-CXXFLAGS_DEBUG := -O0 -g -D_DEBUG -DRETAIL + CXXFLAGS_RELEASE := -O2 -DNDEBUG -DRETAIL +-CXXFLAGS_TEST := -O0 -g -D_DEBUG + LIBS += `pkg-config libxml-2.0 --libs` + INCLUDES += -IFCollada `pkg-config libxml-2.0 --cflags` + INCLUDES_TEST := -IFCollada/FColladaTest $(INCLUDES) +@@ -219,33 +217,19 @@ + FCollada/FColladaTest/FCTestXRef/FCTestXRefSimple.cpp \ + FCollada/FColladaTest/FCTestXRef/FCTestXRefTree.cpp \ + +-OBJECTS_DEBUG = $(addprefix output/debug/,$(SOURCE:.cpp=.o)) + OBJECTS_RELEASE = $(addprefix output/release/,$(SOURCE:.cpp=.o)) +-OBJECTS_TEST = $(addprefix output/test/,$(SOURCE:.cpp=.o) $(TEST_SOURCE:.cpp=.o)) +-OBJECTS_ALL = $(OBJECTS_DEBUG) $(OBJECTS_RELEASE) $(OBJECTS_TEST) ++OBJECTS_ALL = $(OBJECTS_RELEASE) + +-all: output/libFColladaSD.a output/libFColladaSR.a install ++all: output/libFColladaSR.a install + + output_dirs: +- bash -c 'mkdir -p output/{debug,release,test}/{FCollada/{FCDocument,FMath,FUtils,FColladaTest/{FCTestAssetManagement,FCTestExportImport,FCTestXRef}},FColladaPlugins/FArchiveXML}' +- +-test: FCollada/FColladaTest/ output/FColladaTest +- ( cd FCollada/FColladaTest/ ; ../../output/FColladaTest ) +- cat FCollada/FColladaTest/FColladaTestLog.txt +- +-output/libFColladaSD.a: $(OBJECTS_DEBUG) | output_dirs +- @echo "$@" +- @ar -cr $@ $(OBJECTS_DEBUG); ranlib $@ ++ bash -c 'mkdir -p output/release/{FCollada/{FCDocument,FMath,FUtils,FColladaTest/{FCTestAssetManagement,FCTestExportImport,FCTestXRef}},FColladaPlugins/FArchiveXML}' + + output/libFColladaSR.a: $(OBJECTS_RELEASE) | output_dirs + @echo "$@" + @ar -cr $@ $(OBJECTS_RELEASE); ranlib $@ + +-output/FColladaTest: $(OBJECTS_TEST) | output_dirs +- $(CXX) -o $@ $(LDFLAGS) $(OBJECTS_TEST) $(LIBS) +- +-install: output/libFColladaSD.a output/libFColladaSR.a +- cp output/libFColladaSD.a ../lib/libFColladaSD.a ++install: output/libFColladaSR.a + cp output/libFColladaSR.a ../lib/libFColladaSR.a + + dfile = $(@:.o=.d) +@@ -255,18 +239,10 @@ + sed -e 's/\#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ + -e '/^$$/ d' -e 's/$$/ :/' < $(dfile) >> $(Pfile) && \ + rm -f $(dfile) +-output/debug/%.o: %.cpp | output_dirs +- @echo "$<" +- $(CXX) $(CXXFLAGS) $(CXXFLAGS_DEBUG) $(INCLUDES) -MD -MF $(dfile) -c $< -o $@ +- $(gendep) + output/release/%.o: %.cpp | output_dirs + @echo "$<" + $(CXX) $(CXXFLAGS) $(CXXFLAGS_RELEASE) $(INCLUDES) -MD -MF $(dfile) -c $< -o $@ + $(gendep) +-output/test/%.o: %.cpp | output_dirs +- @echo "$<" +- $(CXX) $(CXXFLAGS) $(CXXFLAGS_TEST) $(INCLUDES_TEST) -MD -MF $(dfile) -c $< -o $@ +- $(gendep) + + clean: + rm -rf output diff --git a/0ad-debug.patch b/0ad-debug.patch deleted file mode 100644 index 746fda1..0000000 --- a/0ad-debug.patch +++ /dev/null @@ -1,110 +0,0 @@ -diff -up 0ad-0.0.15-alpha/libraries/source/fcollada/src/Makefile.orig 0ad-0.0.15-alpha/libraries/source/fcollada/src/Makefile ---- 0ad-0.0.15-alpha/libraries/source/fcollada/src/Makefile.orig 2013-12-27 17:28:17.825656505 -0200 -+++ 0ad-0.0.15-alpha/libraries/source/fcollada/src/Makefile 2013-12-27 17:30:47.874662251 -0200 -@@ -9,10 +9,7 @@ endif - - CXX ?= g++ - CXXFLAGS += -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS) --CXXFLAGS_DEBUG := -O0 -g -D_DEBUG -DRETAIL - CXXFLAGS_RELEASE := -O1 -DNDEBUG -DRETAIL --# (-O2 with gcc 4.3 causes linker errors when using this library, for unknown reasons, so stick with -O1 until gcc >4.3 is typical.) --CXXFLAGS_TEST := -O0 -g -D_DEBUG - LIBS += `pkg-config libxml-2.0 --libs` - INCLUDES += -IFCollada `pkg-config libxml-2.0 --cflags` - INCLUDES_TEST := -IFCollada/FColladaTest $(INCLUDES) -@@ -181,72 +178,19 @@ SOURCE = \ - FColladaPlugins/FArchiveXML/FAXSceneExport.cpp \ - FColladaPlugins/FArchiveXML/FAXSceneImport.cpp \ - --TEST_SOURCE = \ -- FCollada/FMath/FMArrayTest.cpp \ -- FCollada/FMath/FMQuaternionTest.cpp \ -- FCollada/FMath/FMTreeTest.cpp \ -- FCollada/FUtils/FUBoundingTest.cpp \ -- FCollada/FUtils/FUCrc32Test.cpp \ -- FCollada/FUtils/FUEventTest.cpp \ -- FCollada/FUtils/FUFileManagerTest.cpp \ -- FCollada/FUtils/FUFunctorTest.cpp \ -- FCollada/FUtils/FUObjectTest.cpp \ -- FCollada/FUtils/FUStringBuilderTest.cpp \ -- FCollada/FUtils/FUStringConversionTest.cpp \ -- FCollada/FUtils/FUStringTest.cpp \ -- FCollada/FUtils/FUTestBed.cpp \ -- FCollada/FUtils/FUUniqueStringMapTest.cpp \ -- FCollada/FColladaTest/FCTest.cpp \ -- FCollada/FColladaTest/FCTestAnimation.cpp \ -- FCollada/FColladaTest/FCTestArchiving.cpp \ -- FCollada/FColladaTest/FCTestController.cpp \ -- FCollada/FColladaTest/FCTestGeometryPolygonsTools.cpp \ -- FCollada/FColladaTest/FCTestParameters.cpp \ -- FCollada/FColladaTest/FCTestSceneGraph.cpp \ -- FCollada/FColladaTest/FCTestAssetManagement/FCTAMCrossCloning.cpp \ -- FCollada/FColladaTest/FCTestAssetManagement/FCTAssetManagement.cpp \ -- FCollada/FColladaTest/FCTestExportImport/FCTEIAnimation.cpp \ -- FCollada/FColladaTest/FCTestExportImport/FCTEICamera.cpp \ -- FCollada/FColladaTest/FCTestExportImport/FCTEIEmitter.cpp \ -- FCollada/FColladaTest/FCTestExportImport/FCTEIExtra.cpp \ -- FCollada/FColladaTest/FCTestExportImport/FCTEIGeometry.cpp \ -- FCollada/FColladaTest/FCTestExportImport/FCTEILight.cpp \ -- FCollada/FColladaTest/FCTestExportImport/FCTEIMaterial.cpp \ -- FCollada/FColladaTest/FCTestExportImport/FCTEIPhysics.cpp \ -- FCollada/FColladaTest/FCTestExportImport/FCTEIVisualScene.cpp \ -- FCollada/FColladaTest/FCTestExportImport/FCTestExportImport.cpp \ -- FCollada/FColladaTest/FCTestXRef/FCTestXRef.cpp \ -- FCollada/FColladaTest/FCTestXRef/FCTestXRefAcyclic.cpp \ -- FCollada/FColladaTest/FCTestXRef/FCTestXRefSimple.cpp \ -- FCollada/FColladaTest/FCTestXRef/FCTestXRefTree.cpp \ -- --OBJECTS_DEBUG = $(addprefix output/debug/,$(SOURCE:.cpp=.o)) - OBJECTS_RELEASE = $(addprefix output/release/,$(SOURCE:.cpp=.o)) --OBJECTS_TEST = $(addprefix output/test/,$(SOURCE:.cpp=.o) $(TEST_SOURCE:.cpp=.o)) --OBJECTS_ALL = $(OBJECTS_DEBUG) $(OBJECTS_RELEASE) $(OBJECTS_TEST) -+OBJECTS_ALL = $(OBJECTS_RELEASE) - --all: output_dirs output/libFColladaSD.a output/libFColladaSR.a install -+all: output_dirs output/libFColladaSR.a install - - output_dirs: -- bash -c 'mkdir -p output/{debug,release,test}/{FCollada/{FCDocument,FMath,FUtils,FColladaTest/{FCTestAssetManagement,FCTestExportImport,FCTestXRef}},FColladaPlugins/FArchiveXML}' -- --test: FCollada/FColladaTest/ output/FColladaTest -- ( cd FCollada/FColladaTest/ ; ../../output/FColladaTest ) -- cat FCollada/FColladaTest/FColladaTestLog.txt -- --output/libFColladaSD.a: $(OBJECTS_DEBUG) -- @echo "$@" -- @ar -cr $@ $(OBJECTS_DEBUG); ranlib $@ -+ bash -c 'mkdir -p output/release/{FCollada/{FCDocument,FMath,FUtils,FColladaTest/{FCTestAssetManagement,FCTestExportImport,FCTestXRef}},FColladaPlugins/FArchiveXML}' - - output/libFColladaSR.a: $(OBJECTS_RELEASE) - @echo "$@" - @ar -cr $@ $(OBJECTS_RELEASE); ranlib $@ - --output/FColladaTest: $(OBJECTS_TEST) -- $(CXX) -o $@ $(LDFLAGS) $(OBJECTS_TEST) $(LIBS) -- --install: output/libFColladaSD.a output/libFColladaSR.a -- cp output/libFColladaSD.a ../lib/libFColladaSD.a -+install: output/libFColladaSR.a - cp output/libFColladaSR.a ../lib/libFColladaSR.a - - dfile = $(@:.o=.d) -@@ -256,18 +200,10 @@ gendep = \ - sed -e 's/\#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ - -e '/^$$/ d' -e 's/$$/ :/' < $(dfile) >> $(Pfile) && \ - rm -f $(dfile) --output/debug/%.o: %.cpp -- @echo "$<" -- $(CXX) $(CXXFLAGS) $(CXXFLAGS_DEBUG) $(INCLUDES) -MD -MF $(dfile) -c $< -o $@ -- $(gendep) - output/release/%.o: %.cpp - @echo "$<" - $(CXX) $(CXXFLAGS) $(CXXFLAGS_RELEASE) $(INCLUDES) -MD -MF $(dfile) -c $< -o $@ - $(gendep) --output/test/%.o: %.cpp -- @echo "$<" -- $(CXX) $(CXXFLAGS) $(CXXFLAGS_TEST) $(INCLUDES_TEST) -MD -MF $(dfile) -c $< -o $@ -- $(gendep) - - clean: - rm -rf output diff --git a/0ad-miniupnpc.patch b/0ad-miniupnpc.patch deleted file mode 100644 index 2da8acf..0000000 --- a/0ad-miniupnpc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up 0ad-0.0.15-alpha/source/network/NetServer.cpp.orig 0ad-0.0.15-alpha/source/network/NetServer.cpp ---- 0ad-0.0.15-alpha/source/network/NetServer.cpp.orig 2014-04-18 12:08:43.415641350 -0300 -+++ 0ad-0.0.15-alpha/source/network/NetServer.cpp 2014-04-18 12:09:27.221643028 -0300 -@@ -274,7 +274,7 @@ void* CNetServerWorker::SetupUPnP(void*) - // Check that the port was actually forwarded. - ret = UPNP_GetSpecificPortMappingEntry(urls.controlURL, - data.first.servicetype, -- psPort, protocall, -+ psPort, protocall, externalIPAddress, - intClient, intPort, NULL/*desc*/, - NULL/*enabled*/, duration); - diff --git a/0ad.spec b/0ad.spec index 2c05217..a7625ce 100644 --- a/0ad.spec +++ b/0ad.spec @@ -16,8 +16,8 @@ Summary: Cross-Platform RTS Game of Ancient Warfare Name: 0ad -Version: 0.0.16 -Release: 2 +Version: 0.0.17 +Release: 1 Epoch: 1 License: GPLv2+ and BSD and MIT and IBM Group: Games/Strategy @@ -32,9 +32,7 @@ Source1: %{name}.6 Patch0: %{name}-rpath.patch # Only do fcollada debug build with enabling debug maintainer mode # It also prevents assumption there that it is building in x86 -Patch1: %{name}-debug.patch -# Build with miniupnpc-1.9 -Patch2: %{name}-miniupnpc.patch +Patch1: %{name}-0.0.17-debug.patch # After some trial&error this corrects a %%check failure with gcc 4.9 on i686 Patch3: %{name}-check.patch @@ -98,9 +96,6 @@ hobbyist game developers, since 2001. # disable debug build, and "int 0x3" to trap to debugger (x86 only) %patch1 -p1 %endif -%if %{mdvver} >= 201400 -%patch2 -p1 -%endif %patch3 -p1 %if %{with_system_nvtt}