From: yopito <yopito@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [WIP] simage: update to pre 1.8.1
Date: Mon, 11 Jan 2021 20:27:14 +0100 [thread overview]
Message-ID: <20210111192714.U2DXjuL_pBm0nE-qnNHnmbM3JGUdE0Q9ZZ-FRoS1xGY@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-27805@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 428 bytes --]
There is an updated pull request by yopito against master on the void-packages repository
https://github.com/yopito/void-packages WIP.simage.18
https://github.com/void-linux/void-packages/pull/27805
[WIP] simage: update to pre 1.8.1
do not merge: testing before release
(help upstream, see https://github.com/coin3d/simage/issues/30)
A patch file from https://github.com/void-linux/void-packages/pull/27805.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-WIP.simage.18-27805.patch --]
[-- Type: text/x-diff, Size: 6148 bytes --]
From fa5e8f0076be0fc021a5e32b6b5d8506dd5c6907 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Mon, 29 Jun 2020 06:30:45 +0200
Subject: [PATCH 1/3] simage: update to 1.8.0
---
srcpkgs/simage/patches/cpack-disable.patch | 8 ++++++
srcpkgs/simage/template | 30 ++++++++++------------
2 files changed, 21 insertions(+), 17 deletions(-)
create mode 100644 srcpkgs/simage/patches/cpack-disable.patch
diff --git a/srcpkgs/simage/patches/cpack-disable.patch b/srcpkgs/simage/patches/cpack-disable.patch
new file mode 100644
index 00000000000..a33f903d043
--- /dev/null
+++ b/srcpkgs/simage/patches/cpack-disable.patch
@@ -0,0 +1,8 @@
+--- CMakeLists.txt.ORIG 2019-12-23 23:34:22.000000000 +0100
++++ CMakeLists.txt 2020-01-02 08:43:07.670806885 +0100
+@@ -627,4 +627,4 @@
+
+ # ############################################################################
+ # New CPACK section, please see the README file inside cpack.d directory.
+-add_subdirectory(cpack.d)
++#add_subdirectory(cpack.d)
diff --git a/srcpkgs/simage/template b/srcpkgs/simage/template
index 7f26620e1dd..a7a7de1ce2e 100644
--- a/srcpkgs/simage/template
+++ b/srcpkgs/simage/template
@@ -1,23 +1,20 @@
# Template file for 'simage'
pkgname=simage
-version=1.7.0
-revision=2
-build_style=gnu-configure
-# XXX disable gif support since misuse of giflib 5.x API
-# (3rd param "int *ErrorCode" is missing in all calls)
-configure_args="--without-gif"
-makedepends="libXt-devel libjpeg-turbo-devel libpng-devel tiff-devel jasper-devel
- libsndfile-devel libogg-devel libvorbis-devel"
+version=1.8.0
+revision=1
+wrksrc=${pkgname}-${pkgname}-${version}
+build_style=cmake
+makedepends="libjpeg-turbo-devel libpng-devel tiff-devel jasper-devel
+ libsndfile-devel libvorbis-devel giflib-devel"
short_desc="Library with image format loaders for image files as texture"
maintainer="yopito <pierre.bourgin@free.fr>"
-license="GPL-3"
-homepage="https://bitbucket.org/Coin3D/simage"
-distfiles="https://bitbucket.org/Coin3D/coin/downloads/${pkgname}-${version}.tar.gz"
-checksum=c9a0c43e45f825c46941789f5a8f6c3b61da5ac87e4088cb611ac0fead494def
+license="0BSD"
+homepage="https://github.com/coin3d/simage"
+distfiles="https://github.com/coin3d/simage/archive/${pkgname}-${version}.tar.gz"
+checksum=920904cd7b9814e8eb6d2954e064875a0be6f8c7e921cd8f1ddb434de1f946e3
-pre_configure() {
- sed -i '326s/(setjmp(png_ptr->jmpbuf)/(setjmp(png_jmpbuf(png_ptr))/' \
- src/simage_png.c
+post_install() {
+ vlicense LICENSE
}
simage-devel_package() {
@@ -25,9 +22,8 @@ simage-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/include
- vmove usr/bin
+ vmove usr/lib/cmake
vmove "usr/lib/*.so"
vmove /usr/lib/pkgconfig
- vmove /usr/share/aclocal
}
}
From 8d8af78647211dfbb2bb11769043d37b2fb41212 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sun, 10 Jan 2021 10:15:44 +0100
Subject: [PATCH 2/3] simage: update to pre-1.8.1
---
srcpkgs/simage/patches/cpack-disable.patch | 8 --------
srcpkgs/simage/template | 10 ++++++----
2 files changed, 6 insertions(+), 12 deletions(-)
delete mode 100644 srcpkgs/simage/patches/cpack-disable.patch
diff --git a/srcpkgs/simage/patches/cpack-disable.patch b/srcpkgs/simage/patches/cpack-disable.patch
deleted file mode 100644
index a33f903d043..00000000000
--- a/srcpkgs/simage/patches/cpack-disable.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- CMakeLists.txt.ORIG 2019-12-23 23:34:22.000000000 +0100
-+++ CMakeLists.txt 2020-01-02 08:43:07.670806885 +0100
-@@ -627,4 +627,4 @@
-
- # ############################################################################
- # New CPACK section, please see the README file inside cpack.d directory.
--add_subdirectory(cpack.d)
-+#add_subdirectory(cpack.d)
diff --git a/srcpkgs/simage/template b/srcpkgs/simage/template
index a7a7de1ce2e..3658922366d 100644
--- a/srcpkgs/simage/template
+++ b/srcpkgs/simage/template
@@ -1,8 +1,10 @@
# Template file for 'simage'
+# XXX not yet released
pkgname=simage
-version=1.8.0
+version=1.8.1.20210109
revision=1
-wrksrc=${pkgname}-${pkgname}-${version}
+_git=444274905c26d7d283c695ea5e983301d42a59ee
+wrksrc=${pkgname}-${_git}
build_style=cmake
makedepends="libjpeg-turbo-devel libpng-devel tiff-devel jasper-devel
libsndfile-devel libvorbis-devel giflib-devel"
@@ -10,8 +12,8 @@ short_desc="Library with image format loaders for image files as texture"
maintainer="yopito <pierre.bourgin@free.fr>"
license="0BSD"
homepage="https://github.com/coin3d/simage"
-distfiles="https://github.com/coin3d/simage/archive/${pkgname}-${version}.tar.gz"
-checksum=920904cd7b9814e8eb6d2954e064875a0be6f8c7e921cd8f1ddb434de1f946e3
+distfiles="https://github.com/coin3d/simage/archive/${_git}.tar.gz"
+checksum=f433baba3c0b5a6acaf133a9b92648e1299a3f53cdcaaa8ef2eba636cfaff175
post_install() {
vlicense LICENSE
From 2f5fb0f4663f9bf43a17cc722db6d2bcb682644d Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Mon, 11 Jan 2021 20:26:37 +0100
Subject: [PATCH 3/3] simage: update to pre-1.8.1 2020-01-10
---
srcpkgs/simage/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/simage/template b/srcpkgs/simage/template
index 3658922366d..b12c04bb138 100644
--- a/srcpkgs/simage/template
+++ b/srcpkgs/simage/template
@@ -1,9 +1,9 @@
# Template file for 'simage'
# XXX not yet released
pkgname=simage
-version=1.8.1.20210109
+version=1.8.1.20210110
revision=1
-_git=444274905c26d7d283c695ea5e983301d42a59ee
+_git=d00da9c73972995df953ceaafc563efd88e61bcc
wrksrc=${pkgname}-${_git}
build_style=cmake
makedepends="libjpeg-turbo-devel libpng-devel tiff-devel jasper-devel
@@ -13,7 +13,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
license="0BSD"
homepage="https://github.com/coin3d/simage"
distfiles="https://github.com/coin3d/simage/archive/${_git}.tar.gz"
-checksum=f433baba3c0b5a6acaf133a9b92648e1299a3f53cdcaaa8ef2eba636cfaff175
+checksum=85839444891fda551a897bb66dd5041778566819b9a51356906c6b4fcd71fd89
post_install() {
vlicense LICENSE
next prev parent reply other threads:[~2021-01-11 19:27 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-10 9:18 [PR PATCH] " yopito
2021-01-11 19:27 ` yopito [this message]
2021-01-13 21:20 ` [PR PATCH] [Closed]: " yopito
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210111192714.U2DXjuL_pBm0nE-qnNHnmbM3JGUdE0Q9ZZ-FRoS1xGY@z \
--to=yopito@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).