* [gentoo-commits] repo/gentoo:master commit in: media-libs/lasi/files/, media-libs/lasi/
@ 2017-03-29 18:18 Johannes Huber
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Huber @ 2017-03-29 18:18 UTC (permalink / raw
To: gentoo-commits
commit: fce827e40361fa114e728e848799523b5c1e3ae9
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 18:18:07 2017 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Mar 29 18:18:07 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fce827e4
media-libs/lasi: Remove 1.1.1
Package-Manager: Portage-2.3.5, Repoman-2.3.2
media-libs/lasi/Manifest | 1 -
media-libs/lasi/files/lasi-1.1.1-freetype251.patch | 63 ----------------------
media-libs/lasi/lasi-1.1.1.ebuild | 56 -------------------
3 files changed, 120 deletions(-)
diff --git a/media-libs/lasi/Manifest b/media-libs/lasi/Manifest
index ce5a854f3b4..87fe12e0877 100644
--- a/media-libs/lasi/Manifest
+++ b/media-libs/lasi/Manifest
@@ -1,2 +1 @@
-DIST libLASi-1.1.1.tar.gz 223589 SHA256 175964cb4fec347737899f9fa0b8d7441864ae20f439e013432d9b9072ab3723 SHA512 b6a0aa180baebab5f7817186b443d828169b7493e2436190b9f98ef6f6769f546e05772a02dc705f68adf899f7e51878e580818ea0ce5258943de2273672dc77 WHIRLPOOL e49c63b7d2a6f611ca78b6f6fbef4dc1286bc42b217a870a0d79a9089bc7ad5ba8d902f78aa2ed8e33a9b02a3a400a18a60d459b5ef6fb758cbd88ecb199cefb
DIST libLASi-1.1.2.tar.gz 260948 SHA256 448c6e52263a1e88ac2a157f775c393aa8b6cd3f17d81fc51e718f18fdff5121 SHA512 5a03890b822946805025157497ce5f29fdfbcf5f2941bcd07841d9865cac9653697dbbba426f8527528affd4157e49d0f31a6dad79abdd52222dfcccf135ac91 WHIRLPOOL 1e293bd82e287c10b27476a84778924ab8007e9cf673bc2d9c2f4f1461abccf5cd36a914000fabe1b81cb433c58b70733716bc9010f6b7771e11f6ae582b778a
diff --git a/media-libs/lasi/files/lasi-1.1.1-freetype251.patch b/media-libs/lasi/files/lasi-1.1.1-freetype251.patch
deleted file mode 100644
index 515b159208f..00000000000
--- a/media-libs/lasi/files/lasi-1.1.1-freetype251.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Add compatibility for >=freetype-2.5.1
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
-
---- libLASi-1.1.1/include/LASi.h
-+++ libLASi-1.1.1/include/LASi.h
-@@ -11,7 +11,8 @@
- #include <sstream>
- #include <map>
- #include <pango/pango.h>
--#include <freetype/ftglyph.h>
-+#include <ft2build.h>
-+#include FT_GLYPH_H
-
- class FreetypeGlyphMgr;
- class ContextMgr;
---- libLASi-1.1.1/src/drawGlyph.cpp
-+++ libLASi-1.1.1/src/drawGlyph.cpp
-@@ -6,7 +6,8 @@
- */
-
- #include <ostream>
--#include <freetype/ftoutln.h>
-+#include <ft2build.h>
-+#include FT_OUTLINE_H
- #include <algorithm>
- #include <LASi.h>
- #include <config.h>
---- libLASi-1.1.1/src/glyphMgr.cpp
-+++ libLASi-1.1.1/src/glyphMgr.cpp
-@@ -10,8 +10,7 @@
-
- #include <ft2build.h>
- #include FT_FREETYPE_H
--
--#include <freetype/ftglyph.h>
-+#include FT_GLYPH_H
-
- #include <cassert>
- #include "util.h"
---- libLASi-1.1.1/src/glyphMgr.h
-+++ libLASi-1.1.1/src/glyphMgr.h
-@@ -15,8 +15,8 @@
-
- #include <ft2build.h>
- #include FT_FREETYPE_H
-+#include FT_GLYPH_H
-
--#include <freetype/ftglyph.h>
-
- /** Manage FT_Glyph by insuring that FT_Glyph is handled correctly.
- */
---- libLASi-1.1.1/src/util.h
-+++ libLASi-1.1.1/src/util.h
-@@ -18,7 +18,7 @@
-
- #include <ft2build.h>
- #include FT_FREETYPE_H
--#include <freetype/ftglyph.h>
-+#include FT_GLYPH_H
-
- std::ostream& operator<<(std::ostream&, const FT_Library);
- std::ostream& operator<<(std::ostream&, const FT_Face);
diff --git a/media-libs/lasi/lasi-1.1.1.ebuild b/media-libs/lasi/lasi-1.1.1.ebuild
deleted file mode 100644
index 2ec54a39393..00000000000
--- a/media-libs/lasi/lasi-1.1.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit cmake-utils eutils multilib
-
-MY_PN=libLASi
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="C++ library for postscript stream output"
-HOMEPAGE="http://www.unifont.org/lasi/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-RDEPEND="
- media-libs/freetype:2
- x11-libs/pango"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.1.0-cmake.patch
- "${FILESDIR}"/${PN}-1.1.0-pkgconfig.patch
- "${FILESDIR}"/${PN}-1.1.1-freetype251.patch
- )
-
-src_prepare() {
- cmake-utils_src_prepare
- sed -i \
- -e "s:\/lib$:\/$(get_libdir):" \
- -e "s/libLASi-\${VERSION}/${PF}/" \
- cmake/modules/instdirs.cmake \
- || die "Failed to fix cmake module"
- sed -i \
- -e "s:\${DATA_DIR}/examples:/usr/share/doc/${PF}/examples:" \
- examples/CMakeLists.txt || die
-
- use examples || sed -i -e '/add_subdirectory(examples)/d' CMakeLists.txt
-}
-
-src_configure() {
- CMAKE_BUILD_TYPE=None
- local mycmakeargs=(
- -DCMAKE_INSTALL_LIBDIR="${EPREFIX}"/usr/$(get_libdir)
- )
- use doc || mycmakeargs+=( -DDOXYGEN_EXECUTABLE= )
- cmake-utils_src_configure
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/lasi/files/, media-libs/lasi/
@ 2021-02-13 10:14 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2021-02-13 10:14 UTC (permalink / raw
To: gentoo-commits
commit: 38ea80b509c2b54cdcb52cfa22285db3136eca3f
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Sat Feb 13 10:14:26 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Feb 13 10:14:26 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38ea80b5
media-libs/lasi: Bump to 1.1.3
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
media-libs/lasi/Manifest | 1 +
media-libs/lasi/files/lasi-1.1.3-cmake.patch | 11 +++++
media-libs/lasi/files/lasi-1.1.3-pkgconfig.patch | 20 ++++++++
media-libs/lasi/lasi-1.1.3.ebuild | 59 ++++++++++++++++++++++++
4 files changed, 91 insertions(+)
diff --git a/media-libs/lasi/Manifest b/media-libs/lasi/Manifest
index f05d653a300..da36f05c36a 100644
--- a/media-libs/lasi/Manifest
+++ b/media-libs/lasi/Manifest
@@ -1 +1,2 @@
DIST libLASi-1.1.2.tar.gz 260948 BLAKE2B 044d906abadd902f91726c0e07e6ec364a3419bcea855a58cfeb44be30b2b9e0334c61931d3210750167ebc7599d8d4022960c40b0be68727385cf01b65780bb SHA512 5a03890b822946805025157497ce5f29fdfbcf5f2941bcd07841d9865cac9653697dbbba426f8527528affd4157e49d0f31a6dad79abdd52222dfcccf135ac91
+DIST libLASi-1.1.3.tar.gz 726769 BLAKE2B d8d06fb56e82b78f4342c959965de3908d70d1cec6147a6e3cc3d58ab4e9f978b7966c8e4507c0ff69e4ba3716270f38f3cfcafdc834001e3a0069a3495eda31 SHA512 036fb0ea1536d4ae04c0d9b5bd193ca6828228afe2cba6c1c7e12febd9b936bf3ac677711c122c44d3b12ab2f7b67f5e9dd18f44a4938ceaa2fbcc430a5748ac
diff --git a/media-libs/lasi/files/lasi-1.1.3-cmake.patch b/media-libs/lasi/files/lasi-1.1.3-cmake.patch
new file mode 100644
index 00000000000..87ff82e0ba7
--- /dev/null
+++ b/media-libs/lasi/files/lasi-1.1.3-cmake.patch
@@ -0,0 +1,11 @@
+--- a/cmake/modules/summary.cmake
++++ b/cmake/modules/summary.cmake
+@@ -30,7 +30,7 @@ WATCOM: ${WATCOM}
+
+ CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}
+ CMAKE_CXX_COMPILER: ${CMAKE_CXX_COMPILER}")
+-if(NOT CMAKE_BUILD_TYPE)
++if(NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQUAL "None")
+ set(_output_results
+ "${_output_results}
+ CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
diff --git a/media-libs/lasi/files/lasi-1.1.3-pkgconfig.patch b/media-libs/lasi/files/lasi-1.1.3-pkgconfig.patch
new file mode 100644
index 00000000000..dbc831d4a27
--- /dev/null
+++ b/media-libs/lasi/files/lasi-1.1.3-pkgconfig.patch
@@ -0,0 +1,20 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -66,6 +66,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/config.h
+ configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/lasi.pc.in
+ ${CMAKE_CURRENT_BINARY_DIR}/lasi.pc
++@ONLY
+ )
+
+ install(FILES
+--- a/lasi.pc.in
++++ b/lasi.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir@
++libdir=${exec_prefix}/@libdir@
+ includedir=@includedir@
+
+ Name: LASi
diff --git a/media-libs/lasi/lasi-1.1.3.ebuild b/media-libs/lasi/lasi-1.1.3.ebuild
new file mode 100644
index 00000000000..e2e42d403fd
--- /dev/null
+++ b/media-libs/lasi/lasi-1.1.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_PN=libLASi
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="C++ library for postscript stream output"
+HOMEPAGE="http://www.unifont.org/lasi"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+
+RDEPEND="
+ dev-libs/glib:2
+ media-libs/freetype:2
+ x11-libs/pango"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-cmake.patch
+ "${FILESDIR}"/${P}-pkgconfig.patch
+)
+
+src_prepare() {
+ cmake_src_prepare
+ sed -i \
+ -e "s:\/lib$:\/$(get_libdir):" \
+ -e "s/libLASi-\${VERSION}/${PF}/" \
+ cmake/modules/instdirs.cmake || die
+ sed -i \
+ -e "s:\${DATA_DIR}/examples:/usr/share/doc/${PF}/examples:" \
+ examples/CMakeLists.txt || die
+
+ if use !examples; then
+ sed -i -e '/add_subdirectory(examples)/d' CMakeLists.txt
+ fi
+}
+
+src_configure() {
+ # doesn't like CMAKE_BUILD_TYPE = Gentoo
+ CMAKE_BUILD_TYPE=None
+ local mycmakeargs=(
+ -DDOXYGEN_EXECUTABLE=$(usex doc "${BROOT}"/usr/bin/doxygen '')
+ -DUSE_RPATH=OFF
+ )
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-02-13 10:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-02-13 10:14 [gentoo-commits] repo/gentoo:master commit in: media-libs/lasi/files/, media-libs/lasi/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2017-03-29 18:18 Johannes Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox