From nobody Sun Sep 25 22:49:47 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MbLgH5s8Vz4d8VW; Sun, 25 Sep 2022 22:49:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MbLgH5SR4z3qd0; Sun, 25 Sep 2022 22:49:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664146187; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5fQUh5s++TigZUeNk6+bx90JWLgikQlbftezs4+fMfc=; b=nHfD3lUKPdmTZTU8UT8YnXGHfb78HbbRRGdOknEp0rwJiKRZZglBWvAQ8zhTig1ghXUlgB zn9K7BDw7GzIwUJjDFdLuQ3oTg8rZyEQwTEjIvZ1azV81Nz47+CYTN/G4hCmn+oXtcZ7r3 LiNX+OTgRe89fX/FkN3vxMvnalnKs1c+bX6EhmYT3hIpIWrK0e3m1JqoCAP5JhCFDMtpCf 9uFmDvnrkuvdfZyUnMGDn5IbNgM1ZQGwdQ+DNy3Sco7aIYKT61e9XL71bTaLgj6OAyRJwN uOzAlaYbYnjHR09kj0l3NH0SpQWni2IWI4SGcH+c0kpiluUmIAucpKhQbQ8gIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MbLgH4YpxzZb9; Sun, 25 Sep 2022 22:49:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28PMnlcn092091; Sun, 25 Sep 2022 22:49:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28PMnlIY092090; Sun, 25 Sep 2022 22:49:47 GMT (envelope-from git) Date: Sun, 25 Sep 2022 22:49:47 GMT Message-Id: <202209252249.28PMnlIY092090@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 49356d672e07 - main - graphics/squish: Update to 1.5 and release back to pool List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 49356d672e07206e281ac8de43894d63b3369f45 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664146187; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5fQUh5s++TigZUeNk6+bx90JWLgikQlbftezs4+fMfc=; b=S34I2ptczHTXkVIVgtiL4HsYUmfrZsmJMZLgQbj7ioCCkjEMCFPeAbWX4okRxH8mj/BBuZ bR1rPsZTyjfzFUe9+3Cd3wGZ/XaBcbPCBE4lWWtdc3dFWYjhSMClFYBD4qp9aIgftKRmVK 421WNpeFWmcu+Arx/3Aoi3Jo2yQAdsAOG2fPrKsp25RL7gNBbU11r5egWGJMm6OTl/Xwvv 6KLucvh+CB9lfxJ41XCwUBuzPn5PH5efjsmtDjqVhGRX59C+Uc36KsPZpY3fBzimrLPESU TjeE5Q8YRoSpnYTpi9DO2CRnb0gw57xoRT6LIZgQHGLPmH4mK+qzFVRq13c+RA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664146187; a=rsa-sha256; cv=none; b=TB4zZfY+bUKo6WUh6A2+PXHb7QmLnV6i59bXyLnMmZdMFjBuH0/eUPvFGIkZiq1EQtRhwz lwf4uOm4sdAjREykaTTnPxsAD8ix0BrzVDuSi0hCHff/cTbUUA2JFj3p+AO1EmMWLIvLU8 mkqe8YbhBxBd51ZZYLbrREOHDUDhItrJ4CRFB6RKyQzwQSyIsipqnWzSqC6FZ9oiavgQa0 vOrYFcVT3vVT5Uv+zIn+sjNzDTHftKbCVEj5yBhhBhyO0cJYjbhrz+gvFPgTCs/88r3EhU P06dHQ7ihRpr/+/NrHg2a502MlH2W5W9v3Q/mK8XYYaRmTFO76co8XjuvZj7cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=49356d672e07206e281ac8de43894d63b3369f45 commit 49356d672e07206e281ac8de43894d63b3369f45 Author: Daniel Engberg AuthorDate: 2022-09-25 22:43:40 +0000 Commit: Daniel Engberg CommitDate: 2022-09-25 22:47:29 +0000 graphics/squish: Update to 1.5 and release back to pool Enable OpenMP support on amd64 and aarch64 Release port back to pool as maintainer has trouble finding time to maintain it. Thanks for all your time and effort! PR: 262725 Approved by: portmgr (maintainer timeout, 2+ weeks) --- graphics/squish/Makefile | 35 ++++++++++++++---------------- graphics/squish/distinfo | 5 +++-- graphics/squish/files/BSDmakefile | 15 ------------- graphics/squish/files/patch-CMakeLists.txt | 14 ++++++++++++ 4 files changed, 33 insertions(+), 36 deletions(-) diff --git a/graphics/squish/Makefile b/graphics/squish/Makefile index d6d0765dc9a1..9bc93caabf71 100644 --- a/graphics/squish/Makefile +++ b/graphics/squish/Makefile @@ -1,31 +1,28 @@ PORTNAME= squish -PORTVERSION= 1.10 -PORTREVISION= 2 +DISTVERSION= 1.15 CATEGORIES= graphics -MASTER_SITES= https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libsquish/ +MASTER_SITES= SF/lib${PORTNAME} +DISTNAME= lib${PORTNAME}-${DISTVERSION} -MAINTAINER= rddeblois@gmail.com +MAINTAINER= ports@FreeBSD.org COMMENT= Open source DXT compression library -WWW= https://code.google.com/p/libsquish/ +WWW= https://sourceforge.net/projects/libsquish/ LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE.txt -USES= uidfix -MAKE_ENV= INSTALL_DIR=${STAGEDIR}${PREFIX} -PLIST_FILES= include/squish.h \ - lib/libsquish.a lib/libsquish.so.1 lib/libsquish.so -MAKEFILE= ${FILESDIR}/BSDmakefile +USES= cmake tar:tgz USE_LDCONFIG= yes -OPTIONS_RADIO= RG1 -OPTIONS_RADIO_RG1= ALTIVEC SSE -OPTIONS_DEFAULT_amd64= SSE -OPTIONS_DEFAULT_powerpc64= ALTIVEC -OPTIONS_DEFAULT_powerpc64le= ALTIVEC -ALTIVEC_DESC= Use Altivec instructions -RG1_DESC= Optimizations Selection +NO_WRKSUBDIR= yes -ALTIVEC_CXXFLAGS= -DSQUISH_USE_ALTIVEC=1 -maltivec -SSE_CXXFLAGS= -DSQUISH_USE_SSE=2 -msse2 +PLIST_FILES= lib/libsquish.so.0.0 \ + lib/libsquish.so \ + include/squish.h + +CMAKE_ON_aarch64= BUILD_SQUISH_WITH_OPENMP +CMAKE_ON_amd64= BUILD_SQUISH_WITH_OPENMP BUILD_SQUISH_WITH_SSE2 +CMAKE_ON_i386= BUILD_SQUISH_WITH_OPENMP +CMAKE_ON= BUILD_SHARED_LIBS ${CMAKE_ON_${ARCH}} .include diff --git a/graphics/squish/distinfo b/graphics/squish/distinfo index ca001ca2af33..47c19608dd7b 100644 --- a/graphics/squish/distinfo +++ b/graphics/squish/distinfo @@ -1,2 +1,3 @@ -SHA256 (squish-1.10.tar.gz) = aec3428badafdbb3b0ed1ea3a385a8029e65694282459f61b4a538963e8cada3 -SIZE (squish-1.10.tar.gz) = 45009 +TIMESTAMP = 1664129303 +SHA256 (libsquish-1.15.tgz) = 628796eeba608866183a61d080d46967c9dda6723bc0a3ec52324c85d2147269 +SIZE (libsquish-1.15.tgz) = 59199 diff --git a/graphics/squish/files/BSDmakefile b/graphics/squish/files/BSDmakefile deleted file mode 100644 index 0f165e1c91b2..000000000000 --- a/graphics/squish/files/BSDmakefile +++ /dev/null @@ -1,15 +0,0 @@ -LIB= squish -SHLIB_MAJOR= 1 -SRCS!= echo *.cpp -MK_PROFILE= no - -CXXFLAGS+= -include limits.h -I${.CURDIR} - -LIBDIR= ${PREFIX}/lib -INCSDIR= ${PREFIX}/include -INCS= squish.h -# The below two are needed until PR 206126 is resolved -INCSOWN= ${LIBOWN} -INCSGRP= ${LIBGRP} - -.include diff --git a/graphics/squish/files/patch-CMakeLists.txt b/graphics/squish/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..e18b6ec9a148 --- /dev/null +++ b/graphics/squish/files/patch-CMakeLists.txt @@ -0,0 +1,14 @@ +--- CMakeLists.txt.orig 2022-09-25 18:09:06 UTC ++++ CMakeLists.txt +@@ -13,9 +13,9 @@ PROJECT(squish) + + CMAKE_MINIMUM_REQUIRED(VERSION 2.8.3) + +-OPTION(BUILD_SQUISH_WITH_OPENMP "Build with OpenMP." ON) ++OPTION(BUILD_SQUISH_WITH_OPENMP "Build with OpenMP." OFF) + +-OPTION(BUILD_SQUISH_WITH_SSE2 "Build with SSE2." ON) ++OPTION(BUILD_SQUISH_WITH_SSE2 "Build with SSE2." OFF) + OPTION(BUILD_SQUISH_WITH_ALTIVEC "Build with Altivec." OFF) + + OPTION(BUILD_SHARED_LIBS "Build shared libraries." OFF)