textproc/tinyxml2: Update to 10.0.0

- Convert to meson
- Fix 0c022f0fc8
- Bump PORTREVISION for package change
- Bump PORTREVISION of dependent ports for shlib change
- Remove duplicate PORTREVISION from math/linbox

Changes:	https://github.com/leethomason/tinyxml2/releases
		https://github.com/leethomason/tinyxml2/commits/master
This commit is contained in:
Po-Chuan Hsieh 2024-02-21 22:29:27 +08:00
parent 06f56996fb
commit 450aafcba5
No known key found for this signature in database
GPG Key ID: 9A4BD10F002DD04B
15 changed files with 76 additions and 29 deletions

View File

@ -1,6 +1,6 @@
PORTNAME= ignition-common
DISTVERSION= 3.0.0
PORTREVISION= 7
PORTREVISION= 8
CATEGORIES= devel
MASTER_SITES= https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/

View File

@ -2,7 +2,7 @@ PORTNAME= aquaria
DISTVERSIONPREFIX= OSE-v
DISTVERSION= 1.002-22
DISTVERSIONSUFFIX= -g84366ad
PORTREVISION= 9
PORTREVISION= 10
CATEGORIES= games
PATCH_SITES= https://github.com/AquariaOSE/Aquaria/commit/

View File

@ -1,6 +1,6 @@
PORTNAME= irrlamb
PORTVERSION= 1.0.3
PORTREVISION= 2
PORTREVISION= 3
DISTVERSIONPREFIX= v
CATEGORIES= games

View File

@ -1,6 +1,6 @@
PORTNAME= stuntrally
PORTVERSION= 2.7
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= games
MAINTAINER= amdmi3@FreeBSD.org

View File

@ -1,6 +1,6 @@
PORTNAME= trigger-rally
PORTVERSION= 0.6.6.1
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= games
MASTER_SITES= SF/trigger-rally/trigger-${PORTVERSION}

View File

@ -1,8 +1,7 @@
PORTNAME= linbox
PORTVERSION= 1.7.0
PORTREVISION= 1
DISTVERSIONPREFIX= v
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= math
MAINTAINER= thierry@FreeBSD.org

View File

@ -1,7 +1,7 @@
PORTNAME= dartsim
DISTVERSIONPREFIX= v
DISTVERSION= 6.13.0
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= misc
MAINTAINER= yuri@FreeBSD.org

View File

@ -1,6 +1,6 @@
PORTNAME= sdformat
DISTVERSION= 8.0.0
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= misc
MASTER_SITES= https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/

View File

@ -1,7 +1,7 @@
PORTNAME= ecal
DISTVERSIONPREFIX= v
DISTVERSION= 5.12.1
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= net devel
MAINTAINER= yuri@FreeBSD.org
@ -53,7 +53,7 @@ CMAKE_ARGS= -DGIT_REVISION_MAJOR=${DISTVERSION:R:R} \
-Dqwt_LIBRARY=${LOCALBASE}/lib/qt5/libqwt6.so
CXXFLAGS+= -pthread # see https://github.com/eclipse-ecal/ecal/issues/933
LDFLAGS+= -labsl_hash -labsl_log_internal_message -labsl_log_internal_nullguard -labsl_spinlock_wait
LDFLAGS+= -labsl_hash -labsl_log_internal_message -labsl_log_internal_nullguard -labsl_spinlock_wait -ltinyxml2
USE_CXXSTD= c++17
PLIST_SUB= VERSION=${DISTVERSION}

View File

@ -1,6 +1,15 @@
--- CMakeLists.txt.orig 2022-12-23 09:10:20 UTC
--- CMakeLists.txt.orig 2023-10-27 08:38:06 UTC
+++ CMakeLists.txt
@@ -231,7 +231,7 @@ endif()
@@ -182,7 +182,7 @@ endif()
set(possible_subprojects
Protobuf
spdlog
- tinyxml2
+ #tinyxml2
fineftp
termcolor
recycle
@@ -234,7 +234,7 @@ endif()
find_package(CMakeFunctions REQUIRED)

View File

@ -0,0 +1,18 @@
--- app/rec/rec_server_core/CMakeLists.txt.orig 2023-10-27 08:38:06 UTC
+++ app/rec/rec_server_core/CMakeLists.txt
@@ -20,7 +20,6 @@ find_package(Threads REQUIRED)
find_package(Protobuf REQUIRED)
find_package(spdlog REQUIRED)
find_package(fineftp REQUIRED)
-find_package(tinyxml2 REQUIRED)
set(PROJECT_NAME rec_server_core)
@@ -66,7 +65,6 @@ create_targets_protobuf()
target_link_libraries(${PROJECT_NAME}
PRIVATE
- tinyxml2::tinyxml2
protobuf::libprotobuf
eCAL::core
eCAL::app_pb

View File

@ -0,0 +1,18 @@
--- app/sys/sys_core/CMakeLists.txt.orig 2023-10-27 08:38:06 UTC
+++ app/sys/sys_core/CMakeLists.txt
@@ -21,7 +21,6 @@ project(sys_core)
find_package(Threads REQUIRED)
find_package(Protobuf REQUIRED)
find_package(spdlog REQUIRED)
-find_package(tinyxml2 REQUIRED)
set(ecalsyscore_src
include/ecalsys/ecal_sys.h
@@ -88,7 +87,6 @@ create_targets_protobuf()
target_link_libraries(${PROJECT_NAME}
Threads::Threads
- tinyxml2::tinyxml2
spdlog::spdlog
protobuf::libprotobuf
eCAL::core

View File

@ -1,7 +1,7 @@
PORTNAME= encfs
DISTVERSIONPREFIX= v
DISTVERSION= 1.9.5
PORTREVISION= 6
PORTREVISION= 7
CATEGORIES= sysutils
PKGNAMEPREFIX= fusefs-

View File

@ -1,27 +1,30 @@
PORTNAME= tinyxml2
DISTVERSION= 10.0.0
PORTVERSION= 10.0.0
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= textproc
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= Small C++ XML Parser
WWW= https://github.com/leethomason/tinyxml2
WWW= https://leethomason.github.io/tinyxml2/ \
https://github.com/leethomason/tinyxml2
LICENSE= ZLIB
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
USES= cmake:testing compiler:c++11-lang cpe dos2unix pathfix
CPE_VENDOR= tinyxml2_project
USES= compiler:c++11-lang cpe dos2unix meson pathfix
MESON_ARGS= --default-library=both \
-Ddebug=false \
-Dtests=true
USE_LDCONFIG= yes
USE_GITHUB= yes
GH_ACCOUNT= leethomason
PLIST_SUB= PORTVERSION=${PORTVERSION}
CMAKE_TESTING_ON= tinyxml2_BUILD_TESTING
PLIST_SUB= DISTVERSION=${DISTVERSION}
GH_ACCOUNT= leethomason
USE_GITHUB= yes
CMAKE_OFF= tinyxml2_BUILD_TESTING
CMAKE_ON= BUILD_SHARED_LIBS
CPE_VENDOR= tinyxml2_project
OPTIONS_DEFINE= EXAMPLES
@ -29,4 +32,7 @@ post-install-EXAMPLES-on:
${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
cd ${WRKSRC}/ && ${COPYTREE_SHARE} resources ${STAGEDIR}${EXAMPLESDIR}/
do-test:
cd ${WRKSRC}/ && _build/xmltest
.include <bsd.port.mk>

View File

@ -1,11 +1,8 @@
include/tinyxml2.h
lib/cmake/tinyxml2/tinyxml2-config-version.cmake
lib/cmake/tinyxml2/tinyxml2-config.cmake
lib/cmake/tinyxml2/tinyxml2-shared-targets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/tinyxml2/tinyxml2-shared-targets.cmake
lib/libtinyxml2.a
lib/libtinyxml2.so
lib/libtinyxml2.so.10
lib/libtinyxml2.so.%%DISTVERSION%%
lib/libtinyxml2.so.%%PORTVERSION%%
libdata/pkgconfig/tinyxml2.pc
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/dream.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/resources/empty.xml