Bug 279473 - graphics/ptex: replace local patches with committed by upstream
Summary: graphics/ptex: replace local patches with committed by upstream
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Vladimir Druzenko
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2024-06-02 17:47 UTC by Vladimir Druzenko
Modified: 2024-06-25 10:38 UTC (History)
1 user (show)

See Also:
FreeBSD: maintainer-feedback+


Attachments
v1 (3.67 KB, patch)
2024-06-02 17:47 UTC, Vladimir Druzenko
vvd: maintainer-approval?
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Vladimir Druzenko freebsd_committer freebsd_triage 2024-06-02 17:47:44 UTC
Created attachment 251164 [details]
v1

Tested build in poudriere (testport) 13.3 amd64, i386 and on live system 13.3 amd64.

Replace local patches with committed by upstream:
https://github.com/wdas/ptex/commit/8ff5c3e2cf2d2689ca09fc258da2173bfd57cf84

While here sort Makefile, pet portclippy and portlint.
Comment 1 Shane 2024-06-03 10:18:14 UTC
Comment on attachment 251164 [details]
v1

Looks ok to me
Comment 2 commit-hook freebsd_committer freebsd_triage 2024-06-03 10:49:40 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=928157c8fd0982a747984e075644f928ac09fae0

commit 928157c8fd0982a747984e075644f928ac09fae0
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2024-06-03 10:42:55 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2024-06-03 10:42:55 +0000

    graphics/ptex: replace local patches with committed by upstream

    Replace local patches with committed by upstream:
    https://github.com/wdas/ptex/commit/8ff5c3e2cf2d2689ca09fc258da2173bfd57cf84

    While here sort Makefile, pet portclippy and portlint.

    PR:             279473
    Approved by:    Shane <FreeBSD@ShaneWare.Biz> (maintainer)

 graphics/ptex/Makefile                                 | 12 +++++++-----
 graphics/ptex/distinfo                                 |  4 +++-
 graphics/ptex/files/patch-CMakeLists.txt (gone)        | 18 ------------------
 .../ptex/files/patch-src_ptex_PtexPlatform.h (gone)    | 12 ------------
 .../ptex/files/patch-src_ptex_PtexWriter.cpp (gone)    | 10 ----------
 5 files changed, 10 insertions(+), 46 deletions(-)
Comment 3 Vladimir Druzenko freebsd_committer freebsd_triage 2024-06-24 20:21:29 UTC
2.4.3 released: https://github.com/wdas/ptex/releases/tag/v2.4.3

Patch is almost trivial:
--- a/graphics/ptex/Makefile
+++ b/graphics/ptex/Makefile
@@ -1,11 +1,7 @@
 PORTNAME=      ptex
 DISTVERSIONPREFIX=     v
-DISTVERSION=   2.4.2
-PORTREVISION=  1
+DISTVERSION=   2.4.3
 CATEGORIES=    graphics
-
-PATCH_SITES=   https://github.com/wdas/${PORTNAME}/commit/
-PATCHFILES+=   8ff5c3e2cf2d2689ca09fc258da2173bfd57cf84.patch:-p1 # fix builds for FreeBSD

 MAINTAINER=    FreeBSD@Shaneware.biz
 COMMENT=       Per face texture library
--- a/graphics/ptex/distinfo
+++ b/graphics/ptex/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1717349736
-SHA256 (wdas-ptex-v2.4.2_GH0.tar.gz) = c8235fb30c921cfb10848f4ea04d5b662ba46886c5e32ad5137c5086f3979ee1
-SIZE (wdas-ptex-v2.4.2_GH0.tar.gz) = 312942
-SHA256 (8ff5c3e2cf2d2689ca09fc258da2173bfd57cf84.patch) = ad62e19cbf74c370b0906a11e0fff13d2057fd10fb00ee7706da4396c309d473
-SIZE (8ff5c3e2cf2d2689ca09fc258da2173bfd57cf84.patch) = 2016
+TIMESTAMP = 1719258858
+SHA256 (wdas-ptex-v2.4.3_GH0.tar.gz) = 435aa2ee1781ff24859bd282b7616bfaeb86ca10604b13d085ada8aa7602ad27
+SIZE (wdas-ptex-v2.4.3_GH0.tar.gz) = 312843
--- a/graphics/ptex/pkg-plist
+++ b/graphics/ptex/pkg-plist
@@ -6,13 +6,13 @@
 include/ptex/PtexUtils.h
 include/ptex/PtexVersion.h
 include/ptex/Ptexture.h
+lib/cmake/Ptex/ptex-config-version.cmake
+lib/cmake/Ptex/ptex-config.cmake
+lib/cmake/Ptex/ptex-exports-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/Ptex/ptex-exports.cmake
 lib/libPtex.a
 lib/libPtex.so
 lib/libPtex.so.2.4
-share/cmake/Ptex/ptex-config-version.cmake
-share/cmake/Ptex/ptex-config.cmake
-share/cmake/Ptex/ptex-exports-%%CMAKE_BUILD_TYPE%%.cmake
-share/cmake/Ptex/ptex-exports.cmake
 %%PORTDOCS%%%%DOCSDIR%%/PtexCache_8cpp.html
 %%PORTDOCS%%%%DOCSDIR%%/PtexCache_8cpp_source.html
 %%PORTDOCS%%%%DOCSDIR%%/PtexCache_8h.html
@@ -397,3 +397,4 @@
 %%PORTDOCS%%%%DOCSDIR%%/tab_sd.png
 %%PORTDOCS%%%%DOCSDIR%%/tabs.css
 %%PORTDOCS%%%%DOCSDIR%%/uvellipse.png
+share/pkgconfig/ptex.pc

No time for create separate PR with attach.
Shane, is this patch ok for you?
Comment 4 Shane 2024-06-25 09:12:58 UTC
yeah looks fine to me
Comment 5 commit-hook freebsd_committer freebsd_triage 2024-06-25 10:38:27 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a1357c366554d6336c59c10698f82c8110648ce5

commit a1357c366554d6336c59c10698f82c8110648ce5
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2024-06-25 10:34:19 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2024-06-25 10:34:19 +0000

    graphics/ptex: update 2.4.2 → 2.4.3

    Commit log:
    https://github.com/wdas/ptex/compare/v2.4.2...v2.4.3

    PR:             279473
    Approved by:    Shane <FreeBSD@ShaneWare.Biz> (maintaner)

 graphics/ptex/Makefile  | 6 +-----
 graphics/ptex/distinfo  | 8 +++-----
 graphics/ptex/pkg-plist | 9 +++++----
 3 files changed, 9 insertions(+), 14 deletions(-)