From 525ce6cf9a7cfed7ee9cd00e419b31bbb847442e Mon Sep 17 00:00:00 2001 From: Ionen Wolkens <ionen@gentoo.org> Date: Tue, 24 Dec 2024 11:08:34 -0500 Subject: dev-libs/nativefiledialog-extended: fix typo in comment Signed-off-by: Ionen Wolkens <ionen@gentoo.org> --- .../nativefiledialog-extended/nativefiledialog-extended-1.2.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/nativefiledialog-extended/nativefiledialog-extended-1.2.1.ebuild b/dev-libs/nativefiledialog-extended/nativefiledialog-extended-1.2.1.ebuild index 4b321cb51bfc..a64a2cf3bb9c 100644 --- a/dev-libs/nativefiledialog-extended/nativefiledialog-extended-1.2.1.ebuild +++ b/dev-libs/nativefiledialog-extended/nativefiledialog-extended-1.2.1.ebuild @@ -35,7 +35,7 @@ PATCHES=( src_configure() { local mycmakeargs=( - # tests are non-automated examples that open interactive dialogues + # tests are non-automated examples that open interactive dialogs -DNFD_BUILD_TESTS=no -DNFD_PORTAL=$(usex desktop-portal) ) -- cgit v1.2.3-65-gdbad From 9ed654c106c77a5fd5ba835c576017662937b252 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens <ionen@gentoo.org> Date: Tue, 24 Dec 2024 19:07:04 -0500 Subject: x11-libs/fltk: add myself as a maintainer Don't really use this, but don't mind taking care of it to some extend. Signed-off-by: Ionen Wolkens <ionen@gentoo.org> --- x11-libs/fltk/metadata.xml | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/x11-libs/fltk/metadata.xml b/x11-libs/fltk/metadata.xml index cc385decf7fd..9c84f80f4c14 100644 --- a/x11-libs/fltk/metadata.xml +++ b/x11-libs/fltk/metadata.xml @@ -1,18 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> -<longdescription> - The Fast Light ToolKit is a cross-platform C++ user interface - toolkit for X and OpenGL. FLTK (pronounced "fulltick") provides GUI - functionality and supports 3D graphics via OpenGL and its built-in - GLUT emulation. FLTK also includes a UI builder called FLUID that - can be used to create applications. -</longdescription> -<upstream> - <remote-id type="github">fltk/fltk</remote-id> -</upstream> -<use> - <flag name="games">Builds and installs some extra games</flag> -</use> + <maintainer type="person"> + <email>ionen@gentoo.org</email> + <name>Ionen Wolkens</name> + </maintainer> + <longdescription> + The Fast Light ToolKit is a cross-platform C++ user interface + toolkit for X and OpenGL. FLTK (pronounced "fulltick") provides + GUI functionality and supports 3D graphics via OpenGL and its + built-in GLUT emulation. FLTK also includes a UI builder called + FLUID that can be used to create applications. + </longdescription> + <upstream> + <remote-id type="github">fltk/fltk</remote-id> + </upstream> + <use> + <flag name="games">Builds and installs some extra games</flag> + </use> </pkgmetadata> -- cgit v1.2.3-65-gdbad From bf28418f30a122955e636dfba07d29cfa7447e75 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens <ionen@gentoo.org> Date: Tue, 24 Dec 2024 19:16:13 -0500 Subject: x11-libs/fltk: add 1.4.1 Brand new ebuild not really based on the old. Changes may or may not introduce some regressions, but will see to these as needed. Regardless of the ebuild, note some revdeps may be broken with fltk-1.4.x. "Often" it's just trivial like a missing include (IWYU) or an include needing different casing due to compatibility symlinks (e.g. Fl/Fl_file_chooser.H -> FL/Fl_File_Chooser.H>) being dropped. Upstream discourages re-enabling them and suggests fixing packages instead. Some revdeps may also be relying on X-specific things (e.g. including x.H and using fl_display), and may need to depend on fltk[X(+)] (have not really looked at if things work on wayland). x.H is also deprecated and due for removal, should use platform.H. I've fixed a few while updating revdeps for := and USE changes but haven't tried nor handled everything myself. That aside, overview of (some) notable ebuild differences vs old: * Use cmake Upstream plans to remove autotools support in 1.5.0, so. * Actually run some tests The old ebuild's src_test was just building tests and never running anything, so at least run (minor) "unittests --core" like upstream's CI does. * Add subslot Gets a new soname + ABI incompatible changes every 1.x versions, but <1.3 is so old that never got a subslot (see README.abi-version.txt). * Drop multilib Do not think this is worth keeping. At most old 32bit prebuilts can need 32bit fltk but they cannot use 1.4 due to soname/ABI changes. (*if* really needed could consider a fltk-compat:1.3 for these). Can revisit if a reason to. * Drop USE=games Not convinced that there is real interest in these example apps being installed, and they all have generic naming by default (e.g. previous was installing /usr/bin/sudoku) making it easy to conflict. They also need to be installed manually (no cmake option for this that I can see at the moment). Could revisit if there is actual users and it is not just for completeness. * Drop USE=xft Can use either pango or xft w/ USE=X with pango being preferred, and it is kind of bogus to disable both (breaks things in unexpected ways). So now USE=cairo will use pango (forced by build system if cairo is enabled, -DFLTK_USE_PANGO accomplishes little), and USE=-cairo uses xft only. Pango/cairo is not optional for wayland, and that's why USE=cairo is default enabled now (also because it supposedly renders better on X as well). * Drop USE=threads, always enabled Nothing special there, but requires adjusting some revdeps w/ (+) * Drop USE=xinerama and always depend on it if USE=X Could understand some users not wanting it, however, for some reason -DFLTK_USE_XINERAMA is ignored when USE="X wayland" (works if -wayland) and README.Wayland.txt says that xinerama is always required if X11 is enabled as well. *could* make it optional with -wayland but that felt messy and a req use of "wayland? ( X? ( xinerama ) )" seems confusing. Ultimately it was enabled by default before and it's a very small dep. May revisit only after the build system gets polished and if there's a demand. * Drop env.d file and -rpath hacks This doesn't install in /usr/lib*/fltk anymore and so no need for LDPATH, and if the FLTK_DOCDIR env var is unset it should fallback to the builtin path which points to /usr/share/doc/${PF}/html (albeit the in-app help browser renders these rather poorly right now, better use a real browser). * Misc notes Was tempted to drop USE=static-libs, but I believe there is a demand for this on this package, may revisit. Considered making fluid optional being a GUI app for developers, but it's also used at build time by some packages and it's not worth being conditional on Gentoo then. It may be possible to make dbus optional with USE=wayland, but build system has no switch for it (automagic-only), so hard-depend for now. For those trying to avoid X libs, hard libglvnd[X] is not a typo, USE="-X wayland opengl" still links with libGLX->libX11 at the moment. Like before, fltk-config --ldflags still gives a wall of unnecessary libraries (that libftlk.so is linked with, more than before w/ wayland) due to expecting static -- but otherwise appears fine despite generated by cmake. bug #494390: pdf build is explicitly disabled in this version, so it shouldn't be trying to use latex (build system also changed, if still into something please open a new bug). Closes: https://bugs.gentoo.org/494390 Closes: https://bugs.gentoo.org/946882 Signed-off-by: Ionen Wolkens <ionen@gentoo.org> --- x11-libs/fltk/Manifest | 1 + x11-libs/fltk/files/fltk-1.4.1-fltk-config.patch | 25 +++++ x11-libs/fltk/files/fltk-1.4.1-tests-odr.patch | 9 ++ x11-libs/fltk/fltk-1.4.1.ebuild | 113 +++++++++++++++++++++++ 4 files changed, 148 insertions(+) create mode 100644 x11-libs/fltk/files/fltk-1.4.1-fltk-config.patch create mode 100644 x11-libs/fltk/files/fltk-1.4.1-tests-odr.patch create mode 100644 x11-libs/fltk/fltk-1.4.1.ebuild diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest index 3864bc146832..afcb53fdfabb 100644 --- a/x11-libs/fltk/Manifest +++ b/x11-libs/fltk/Manifest @@ -1,2 +1,3 @@ DIST fltk-1.3.5-source.tar.gz 5261324 BLAKE2B df05989d6581b570c689e29e9f31e5fc85fa91dee1296d70b5f5c3b4aab527749850ea78bec3ef5947151b21598c3bb04e52f78b5e6db179e7fd922627862b5e SHA512 db7ea7c5f3489195a48216037b9371a50f1119ae7692d66f71b6711e5ccf78814670581bae015e408dee15c4bba921728309372c1cffc90113cdc092e8540821 DIST fltk-1.3.8-source.tar.gz 5335306 BLAKE2B 8c2d2fca4243c0e7c5a8aa46083940f99c8b3e7873d39d6e590a4b66587876393f209e5e7e5eaf4a4cc13f0f97cb03671d97129853b0146eeab409aaf687935e SHA512 5c1cbfc156c49888e25b90dcb9b1ab86a03447e08e00864c3c7ae8a0e32cfbd9154ee630054235c9edfd29fd1d0371ae77eff7b78094fb660dbbdec5cecfc8fb +DIST fltk-1.4.1-source.tar.bz2 8456879 BLAKE2B 0301cfa7f47cde892b390ccabc1724d055cee2544cec6afe60cb1d62fed644d0100865e1889b70c06b8c4169a1af4285500a746e4c82ecb4908567c5887fc084 SHA512 90b223f66e3a8eb23225a259cddfeb90f1f8744ff6a366f274923c1c34d251e028835755d1738efb53398ac7e45e362a71542978faef04fc3d84a87f7b722037 diff --git a/x11-libs/fltk/files/fltk-1.4.1-fltk-config.patch b/x11-libs/fltk/files/fltk-1.4.1-fltk-config.patch new file mode 100644 index 000000000000..ee933b46b4df --- /dev/null +++ b/x11-libs/fltk/files/fltk-1.4.1-fltk-config.patch @@ -0,0 +1,25 @@ +The "CFLAGS" variable here concatenates user's CFLAGS (unwanted in +fltk-config's @CFLAGS@) and FLTK_CFLAGS a bit below (wanted). + +So prevent addition of CMAKE_C_FLAGS_* and keep the rest. + +CXXFLAGS not touched given it does set(CXXFLAGS "${CFLAGS}"). + +Also drop @LDFLAGS@ as a precaution, it's not currently set by cmake +but it's likely an oversight. @LARGEFILE@ (currently still in .in) and +such are only used by autoconf (cmake appends into @CFLAGS@). +--- a/CMake/variables.cmake ++++ b/CMake/variables.cmake +@@ -139,6 +139 @@ +-string(TOUPPER "${CMAKE_BUILD_TYPE}" BUILD_UPPER) +-if(${BUILD_UPPER}) +- set(CFLAGS "${CMAKE_C_FLAGS_${BUILD_UPPER}} ${CFLAGS}") +-endif(${BUILD_UPPER}) +- +-set(CFLAGS "${FLTK_OPTION_OPTIM} ${CMAKE_C_FLAGS} ${CFLAGS}") ++set(CFLAGS "${FLTK_OPTION_OPTIM} ${CFLAGS}") +--- a/fltk-config.in ++++ b/fltk-config.in +@@ -38 +38 @@ +-LDFLAGS="@LDFLAGS@" ++LDFLAGS="" diff --git a/x11-libs/fltk/files/fltk-1.4.1-tests-odr.patch b/x11-libs/fltk/files/fltk-1.4.1-tests-odr.patch new file mode 100644 index 000000000000..7243efa21fcd --- /dev/null +++ b/x11-libs/fltk/files/fltk-1.4.1-tests-odr.patch @@ -0,0 +1,9 @@ +We only use the unittests-shared example and this unused one has ODR +violations. Skip building it for now rather than filter-lto w/ tests +to avoid triggering -Werror=odr -flto CI (ideally would want to only +build unittests and not have to worry about build time + quirks of +all examples). +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -100 +99,0 @@ +-fl_create_example(coordinates coordinates.cxx fltk::fltk) diff --git a/x11-libs/fltk/fltk-1.4.1.ebuild b/x11-libs/fltk/fltk-1.4.1.ebuild new file mode 100644 index 000000000000..c783579112e2 --- /dev/null +++ b/x11-libs/fltk/fltk-1.4.1.ebuild @@ -0,0 +1,113 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake edo xdg + +DESCRIPTION="Fast Light GUI Toolkit" +HOMEPAGE="https://www.fltk.org/" +SRC_URI="https://github.com/fltk/fltk/releases/download/release-${PV}/${P}-source.tar.bz2" + +LICENSE="FLTK LGPL-2 MIT ZLIB" +SLOT="1/$(ver_cut 1-2)" # README.abi-version.txt +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="+X +cairo doc examples opengl static-libs test wayland" +REQUIRED_USE=" + || ( X wayland ) + wayland? ( cairo ) +" +RESTRICT="!test? ( test )" + +RDEPEND=" + media-libs/libjpeg-turbo:= + media-libs/libpng:= + sys-libs/zlib:= + X? ( + x11-libs/libX11 + x11-libs/libXcursor + x11-libs/libXfixes + x11-libs/libXinerama + !cairo? ( + media-libs/fontconfig + x11-libs/libXft + x11-libs/libXrender + ) + ) + cairo? ( + dev-libs/glib:2 + x11-libs/cairo + x11-libs/pango[X?] + ) + opengl? ( + media-libs/glu + media-libs/libglvnd[X] + ) + wayland? ( + dev-libs/wayland + gui-libs/libdecor + sys-apps/dbus + x11-libs/libxkbcommon + ) +" +DEPEND=" + ${RDEPEND} + X? ( x11-base/xorg-proto ) + wayland? ( dev-libs/wayland-protocols ) +" +BDEPEND=" + doc? ( app-text/doxygen ) + wayland? ( dev-util/wayland-scanner ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.4.1-fltk-config.patch + "${FILESDIR}"/${PN}-1.4.1-tests-odr.patch +) + +src_prepare() { + cmake_src_prepare + + # fluid can optionally use html docs at runtime, adjust path + sed -i "s|\${FLTK_DOCDIR}/fltk|&-${PVR}/html|" CMake/export.cmake || die +} + +src_configure() { + local mycmakeargs=( + -DFLTK_BACKEND_WAYLAND=$(usex wayland) + -DFLTK_BACKEND_X11=$(usex X) + -DFLTK_BUILD_FLUID=yes + -DFLTK_BUILD_FLUID_DOCS=no + -DFLTK_BUILD_GL=$(usex opengl) + -DFLTK_BUILD_HTML_DOCS=$(usex doc) + -DFLTK_BUILD_PDF_DOCS=no + -DFLTK_BUILD_SHARED_LIBS=yes + -DFLTK_BUILD_TEST=$(usex test) + -DFLTK_GRAPHICS_CAIRO=$(usex cairo) + -DFLTK_OPTION_STD=yes # will be removed & forced ON in fltk-1.5 + ) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile all $(usev doc docs) +} + +src_test() { + # same that upstream's CI does except with the shared version + edo "${BUILD_DIR}"/bin/test/unittests-shared --core +} + +src_install() { + local DOCS=( + ANNOUNCEMENT CHANGES* CREDITS.txt README* + $(usev examples) + # simpler than using -DFLTK_INSTALL_HTML_DOCS for the location + $(usev doc "${BUILD_DIR}"/documentation/html) + ) + cmake_src_install + + # currently no option to disable building static libs + use static-libs || rm -- "${ED}"/usr/$(get_libdir)/*.a || die +} -- cgit v1.2.3-65-gdbad From 9a1c22101a3c4314aaa78299a0a019e136809f7f Mon Sep 17 00:00:00 2001 From: Ionen Wolkens <ionen@gentoo.org> Date: Wed, 25 Dec 2024 05:45:28 -0500 Subject: x11-libs/fltk: drop 1.3.5-r4, 1.3.9999, 1.4.9999 wrt live, both were broken (patches not applying) for likely a while. Not planning to maintain the live ebuilds myself (and even less multiple branches), so may as well delete them. Will try to do regular bumps when releases happen though. Signed-off-by: Ionen Wolkens <ionen@gentoo.org> --- x11-libs/fltk/Manifest | 1 - x11-libs/fltk/files/fltk-1.3.3-fltk-config.patch | 14 -- x11-libs/fltk/files/fltk-1.3.5-AR.patch | 11 -- x11-libs/fltk/files/fltk-1.3.5-cmake.patch | 33 ---- x11-libs/fltk/files/fltk-1.3.5-optim.patch | 11 -- x11-libs/fltk/files/fltk-1.3.9999-conf-tests.patch | 55 ------ x11-libs/fltk/files/fltk-1.4.9999-cmake.patch | 19 -- x11-libs/fltk/files/fltk-1.4.9999-conf-tests.patch | 42 ----- .../fltk/files/fltk-1.4.9999-makefile-dirs.patch | 14 -- x11-libs/fltk/files/fltk-1.4.9999-optim.patch | 13 -- x11-libs/fltk/fltk-1.3.5-r4.ebuild | 200 -------------------- x11-libs/fltk/fltk-1.3.9999.ebuild | 207 --------------------- x11-libs/fltk/fltk-1.4.9999.ebuild | 200 -------------------- 13 files changed, 820 deletions(-) delete mode 100644 x11-libs/fltk/files/fltk-1.3.3-fltk-config.patch delete mode 100644 x11-libs/fltk/files/fltk-1.3.5-AR.patch delete mode 100644 x11-libs/fltk/files/fltk-1.3.5-cmake.patch delete mode 100644 x11-libs/fltk/files/fltk-1.3.5-optim.patch delete mode 100644 x11-libs/fltk/files/fltk-1.3.9999-conf-tests.patch delete mode 100644 x11-libs/fltk/files/fltk-1.4.9999-cmake.patch delete mode 100644 x11-libs/fltk/files/fltk-1.4.9999-conf-tests.patch delete mode 100644 x11-libs/fltk/files/fltk-1.4.9999-makefile-dirs.patch delete mode 100644 x11-libs/fltk/files/fltk-1.4.9999-optim.patch delete mode 100644 x11-libs/fltk/fltk-1.3.5-r4.ebuild delete mode 100644 x11-libs/fltk/fltk-1.3.9999.ebuild delete mode 100644 x11-libs/fltk/fltk-1.4.9999.ebuild diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest index afcb53fdfabb..db1f593a38b8 100644 --- a/x11-libs/fltk/Manifest +++ b/x11-libs/fltk/Manifest @@ -1,3 +1,2 @@ -DIST fltk-1.3.5-source.tar.gz 5261324 BLAKE2B df05989d6581b570c689e29e9f31e5fc85fa91dee1296d70b5f5c3b4aab527749850ea78bec3ef5947151b21598c3bb04e52f78b5e6db179e7fd922627862b5e SHA512 db7ea7c5f3489195a48216037b9371a50f1119ae7692d66f71b6711e5ccf78814670581bae015e408dee15c4bba921728309372c1cffc90113cdc092e8540821 DIST fltk-1.3.8-source.tar.gz 5335306 BLAKE2B 8c2d2fca4243c0e7c5a8aa46083940f99c8b3e7873d39d6e590a4b66587876393f209e5e7e5eaf4a4cc13f0f97cb03671d97129853b0146eeab409aaf687935e SHA512 5c1cbfc156c49888e25b90dcb9b1ab86a03447e08e00864c3c7ae8a0e32cfbd9154ee630054235c9edfd29fd1d0371ae77eff7b78094fb660dbbdec5cecfc8fb DIST fltk-1.4.1-source.tar.bz2 8456879 BLAKE2B 0301cfa7f47cde892b390ccabc1724d055cee2544cec6afe60cb1d62fed644d0100865e1889b70c06b8c4169a1af4285500a746e4c82ecb4908567c5887fc084 SHA512 90b223f66e3a8eb23225a259cddfeb90f1f8744ff6a366f274923c1c34d251e028835755d1738efb53398ac7e45e362a71542978faef04fc3d84a87f7b722037 diff --git a/x11-libs/fltk/files/fltk-1.3.3-fltk-config.patch b/x11-libs/fltk/files/fltk-1.3.3-fltk-config.patch deleted file mode 100644 index ca7607afa4fc..000000000000 --- a/x11-libs/fltk/files/fltk-1.3.3-fltk-config.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/fltk-config.in -+++ b/fltk-config.in -@@ -42,9 +42,8 @@ - - # flags for C++ compiler: - ARCHFLAGS="@ARCHFLAGS@" --CFLAGS="@CFLAGS@ @LARGEFILE@ @PTHREAD_FLAGS@" --CXXFLAGS="@CXXFLAGS@ @LARGEFILE@ @PTHREAD_FLAGS@" --LDFLAGS="@LDFLAGS@" -+CFLAGS=" @LARGEFILE@ @PTHREAD_FLAGS@" -+CXXFLAGS=" @LARGEFILE@ @PTHREAD_FLAGS@" - LDLIBS="@LIBS@" - OPTIM="@OPTIM@" - CAIROFLAGS="@CAIROFLAGS@" diff --git a/x11-libs/fltk/files/fltk-1.3.5-AR.patch b/x11-libs/fltk/files/fltk-1.3.5-AR.patch deleted file mode 100644 index 34dbc8769f09..000000000000 --- a/x11-libs/fltk/files/fltk-1.3.5-AR.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -430,7 +430,7 @@ AC_PATH_PROG(DOXYDOC,doxygen) - - dnl How do we make libraries? - AC_PROG_RANLIB --AC_PATH_TOOL(AR, ar) -+AC_CHECK_TOOL(AR, ar) - - if test "x$AR" = "x:"; then - AC_MSG_ERROR([Configure could not find the library archiver, aborting.]) diff --git a/x11-libs/fltk/files/fltk-1.3.5-cmake.patch b/x11-libs/fltk/files/fltk-1.3.5-cmake.patch deleted file mode 100644 index 1eac250248d2..000000000000 --- a/x11-libs/fltk/files/fltk-1.3.5-cmake.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -57,6 +57,7 @@ - FL_DSO_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION} - FL_ABI_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}.0 - FL_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}.${FL_PATCH_VERSION} -+FLTK_VERSION_FULL=${FL_VERSION} - - AC_SUBST(FL_MAJOR_VERSION) - AC_SUBST(FL_MINOR_VERSION) -@@ -64,6 +65,7 @@ - AC_SUBST(FL_DSO_VERSION) - AC_SUBST(FL_ABI_VERSION) - AC_SUBST(FL_VERSION) -+AC_SUBST(FLTK_VERSION_FULL) - - AC_SUBST(ARCHFLAGS) - AC_SUBST(OPTIM) -@@ -1576,10 +1578,13 @@ - BINARY_DIR= - AC_SUBST(BINARY_DIR) - -+INCLUDE_DIRS="${includedir}" -+AC_SUBST(INCLUDE_DIRS) -+ - dnl Write all of the files... - AC_CONFIG_HEADER(config.h:configh.in) - AC_CONFIG_HEADER(FL/abi-version.h:abi-version.in) --AC_CONFIG_FILES([makeinclude fltk.list fltk-config fltk.spec FL/Makefile]) -+AC_CONFIG_FILES([makeinclude fltk.list fltk-config fltk.spec FL/Makefile CMake/FLTKConfig.cmake]) - AC_OUTPUT - - dnl Make sure the fltk-config script is executable... diff --git a/x11-libs/fltk/files/fltk-1.3.5-optim.patch b/x11-libs/fltk/files/fltk-1.3.5-optim.patch deleted file mode 100644 index 4d1512d749dd..000000000000 --- a/x11-libs/fltk/files/fltk-1.3.5-optim.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -1265,7 +1265,7 @@ - if test "x$with_optim" != x; then - OPTIM="$with_optim $OPTIM" - else -- OPTIM="-Os $OPTIM" -+ OPTIM=" $OPTIM" - fi - fi - diff --git a/x11-libs/fltk/files/fltk-1.3.9999-conf-tests.patch b/x11-libs/fltk/files/fltk-1.3.9999-conf-tests.patch deleted file mode 100644 index 994df56ad361..000000000000 --- a/x11-libs/fltk/files/fltk-1.3.9999-conf-tests.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -100,9 +103,6 @@ - touch config.h - chmod +x fltk-config - --configure: configure.ac -- autoconf -- - config.guess config.sub: - -automake --add-missing 2> /dev/null - if [ ! -e config.sub ]; then echo NOTE: Using frozen copy of config.sub; cp misc/config.sub . ; fi ---- a/documentation/Makefile -+++ b/documentation/Makefile -@@ -84,11 +84,6 @@ - $(INSTALL_DATA) fltk.pdf $(DESTDIR)$(docdir); \ - fi - echo "Installing man pages in $(DESTDIR)$(mandir) ..." -- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat1 -- $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1 -- $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1 -- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat3 -- $(INSTALL_MAN) $(SRC_DOCDIR)/fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3 - -$(INSTALL_DIR) $(DESTDIR)$(mandir)/man1 - $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.man $(DESTDIR)$(mandir)/man1/fluid.1 - $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.man $(DESTDIR)$(mandir)/man1/fltk-config.1 -@@ -96,10 +91,6 @@ - $(INSTALL_MAN) $(SRC_DOCDIR)/fltk.man $(DESTDIR)$(mandir)/man3/fltk.3 - - install-linux install-osx: -- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat6 -- $(INSTALL_MAN) $(SRC_DOCDIR)/blocks.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6 -- $(INSTALL_MAN) $(SRC_DOCDIR)/checkers.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6 -- $(INSTALL_MAN) $(SRC_DOCDIR)/sudoku.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6 - -$(INSTALL_DIR) $(DESTDIR)$(mandir)/man6 - $(INSTALL_MAN) $(SRC_DOCDIR)/blocks.man $(DESTDIR)$(mandir)/man6/blocks.6 - $(INSTALL_MAN) $(SRC_DOCDIR)/checkers.man $(DESTDIR)$(mandir)/man6/checkers.6 -@@ -108,17 +99,11 @@ - - uninstall: - $(RMDIR) $(DESTDIR)$(docdir) -- $(RM) $(DESTDIR)$(mandir)/cat1/fluid.$(CAT1EXT) - $(RM) $(DESTDIR)$(mandir)/man1/fluid.1 -- $(RM) $(DESTDIR)$(mandir)/cat1/fltk-config.$(CAT1EXT) - $(RM) $(DESTDIR)$(mandir)/man1/fltk-config.1 -- $(RM) $(DESTDIR)$(mandir)/cat3/fltk.$(CAT3EXT) - $(RM) $(DESTDIR)$(mandir)/man3/fltk.3 - - uninstall-linux uninstall-osx: -- $(RM) $(DESTDIR)$(mandir)/cat6/blocks.$(CAT6EXT) -- $(RM) $(DESTDIR)$(mandir)/cat6/checkers.$(CAT6EXT) -- $(RM) $(DESTDIR)$(mandir)/cat6/sudoku.$(CAT6EXT) - $(RM) $(DESTDIR)$(mandir)/man6/blocks.6 - $(RM) $(DESTDIR)$(mandir)/man6/checkers.6 - $(RM) $(DESTDIR)$(mandir)/man6/sudoku.6 diff --git a/x11-libs/fltk/files/fltk-1.4.9999-cmake.patch b/x11-libs/fltk/files/fltk-1.4.9999-cmake.patch deleted file mode 100644 index 3f576d501ece..000000000000 --- a/x11-libs/fltk/files/fltk-1.4.9999-cmake.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 6b64110b0..1330d3f27 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1878,10 +1878,13 @@ dnl Set empty BINARY_DIR variable for fltk-config.in (CMake compatibility) - BINARY_DIR= - AC_SUBST([BINARY_DIR]) - -+INCLUDE_DIRS="${includedir}" -+AC_SUBST(INCLUDE_DIRS) -+ - dnl Write all of the files... - AC_CONFIG_HEADERS([config.h:configh.in]) - AC_CONFIG_HEADERS([FL/fl_config.h:fl_config.in]) --AC_CONFIG_FILES([makeinclude fltk.list fltk-config fltk.spec FL/Makefile]) -+AC_CONFIG_FILES([makeinclude fltk.list fltk-config fltk.spec FL/Makefile CMake/FLTKConfig.cmake]) - AC_OUTPUT - - dnl Make sure the fltk-config script is executable... diff --git a/x11-libs/fltk/files/fltk-1.4.9999-conf-tests.patch b/x11-libs/fltk/files/fltk-1.4.9999-conf-tests.patch deleted file mode 100644 index 47db8d03c8d2..000000000000 --- a/x11-libs/fltk/files/fltk-1.4.9999-conf-tests.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/Makefile b/Makefile -index 2d99808d9..283f825dd 100644 ---- a/Makefile -+++ b/Makefile -@@ -103,9 +103,6 @@ makeinclude: configure configh.in makeinclude.in - touch config.h - chmod +x fltk-config - --configure: configure.ac -- autoconf -- - portable-dist: - epm -v -s fltk.xpm fltk - -diff --git a/documentation/Makefile b/documentation/Makefile -index 0b176246b..882fbf8a4 100644 ---- a/documentation/Makefile -+++ b/documentation/Makefile -@@ -91,12 +91,6 @@ install: $(MANPAGES) - $(INSTALL_DATA) fltk.pdf $(DESTDIR)$(docdir); \ - fi - echo "Installing man pages in $(DESTDIR)$(mandir) ..." -- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat1 -- $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1 -- $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1 -- $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-options.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1 -- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat3 -- $(INSTALL_MAN) $(SRC_DOCDIR)/fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3 - -$(INSTALL_DIR) $(DESTDIR)$(mandir)/man1 - $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.man $(DESTDIR)$(mandir)/man1/fluid.1 - $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.man $(DESTDIR)$(mandir)/man1/fltk-config.1 -@@ -105,10 +99,6 @@ install: $(MANPAGES) - $(INSTALL_MAN) $(SRC_DOCDIR)/fltk.man $(DESTDIR)$(mandir)/man3/fltk.3 - - install-linux install-osx: -- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat6 -- $(INSTALL_MAN) $(SRC_DOCDIR)/blocks.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6 -- $(INSTALL_MAN) $(SRC_DOCDIR)/checkers.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6 -- $(INSTALL_MAN) $(SRC_DOCDIR)/sudoku.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6 - -$(INSTALL_DIR) $(DESTDIR)$(mandir)/man6 - $(INSTALL_MAN) $(SRC_DOCDIR)/blocks.man $(DESTDIR)$(mandir)/man6/blocks.6 - $(INSTALL_MAN) $(SRC_DOCDIR)/checkers.man $(DESTDIR)$(mandir)/man6/checkers.6 diff --git a/x11-libs/fltk/files/fltk-1.4.9999-makefile-dirs.patch b/x11-libs/fltk/files/fltk-1.4.9999-makefile-dirs.patch deleted file mode 100644 index e49aa7408cca..000000000000 --- a/x11-libs/fltk/files/fltk-1.4.9999-makefile-dirs.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/Makefile b/Makefile -index c02de0972..2d99808d9 100644 ---- a/Makefile -+++ b/Makefile -@@ -16,8 +16,7 @@ - - include makeinclude - --DIRS = $(IMAGEDIRS) $(LIBDECORDIR) src $(CAIRODIR) $(FLUIDDIR) fltk-options test \ -- documentation -+DIRS = $(IMAGEDIRS) $(LIBDECORDIR) src $(CAIRODIR) fltk-options - - all: makeinclude fltk-config - for dir in $(DIRS); do\ diff --git a/x11-libs/fltk/files/fltk-1.4.9999-optim.patch b/x11-libs/fltk/files/fltk-1.4.9999-optim.patch deleted file mode 100644 index a1e18bbb74b2..000000000000 --- a/x11-libs/fltk/files/fltk-1.4.9999-optim.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 1330d3f27..c76dba26f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1552,7 +1552,7 @@ AS_IF([test -n "$GCC"], [ - AS_IF([test "x$with_optim" != x], [ - OPTIM="$with_optim $OPTIM" - ], [ -- OPTIM="-Os $OPTIM" -+ OPTIM="$OPTIM" - ]) - ]) - diff --git a/x11-libs/fltk/fltk-1.3.5-r4.ebuild b/x11-libs/fltk/fltk-1.3.5-r4.ebuild deleted file mode 100644 index 69b47fc0d881..000000000000 --- a/x11-libs/fltk/fltk-1.3.5-r4.ebuild +++ /dev/null @@ -1,200 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic xdg-utils multilib-minimal - -DESCRIPTION="C++ user interface toolkit for X and OpenGL" -HOMEPAGE="https://www.fltk.org/" -SRC_URI="https://www.fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz" - -SLOT="1" -LICENSE="FLTK LGPL-2" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" -IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama" - -RDEPEND=" - >=media-libs/libpng-1.2:0=[${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] - virtual/jpeg:0=[${MULTILIB_USEDEP}] - x11-libs/libICE[${MULTILIB_USEDEP}] - x11-libs/libSM[${MULTILIB_USEDEP}] - x11-libs/libXcursor[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - x11-libs/libXfixes[${MULTILIB_USEDEP}] - x11-libs/libXt[${MULTILIB_USEDEP}] - cairo? ( x11-libs/cairo[${MULTILIB_USEDEP},X] ) - games? ( !sys-block/blocks ) - opengl? ( - virtual/glu[${MULTILIB_USEDEP}] - virtual/opengl[${MULTILIB_USEDEP}] - ) - xft? ( x11-libs/libXft[${MULTILIB_USEDEP}] ) - xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto - doc? ( app-text/doxygen ) -" -DOCS=( - ANNOUNCEMENT - CHANGES - CHANGES_1.0 - CHANGES_1.1 - CREDITS - README - README.abi-version.txt - README.Cairo.txt - README.CMake.txt - README.MSWindows.txt - README.OSX.txt - README.Unix.txt -) -FLTK_GAMES=" - blocks - checkers - sudoku -" -PATCHES=( - "${FILESDIR}"/${PN}-1.3.0-share.patch - "${FILESDIR}"/${PN}-1.3.3-fltk-config.patch - "${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch - "${FILESDIR}"/${PN}-1.3.3-visibility.patch - "${FILESDIR}"/${PN}-1.3.4-conf-tests.patch - "${FILESDIR}"/${PN}-1.3.5-cmake.patch - "${FILESDIR}"/${PN}-1.3.5-optim.patch - "${FILESDIR}"/${PN}-1.3.5-AR.patch -) - -src_prepare() { - default - - rm -rf zlib jpeg png || die - - sed -i \ - -e 's:@HLINKS@::g' FL/Makefile.in || die - # docs in proper docdir - sed -i \ - -e "/^docdir/s:fltk:${PF}/html:" \ - -e "/SILENT:/d" \ - makeinclude.in || die - - # also in Makefile:config.guess config.sub: - cp misc/config.{guess,sub} . || die - - cp fluid/{,x-}fluid.desktop || die - - eaclocal - eautoconf - multilib_copy_sources -} - -multilib_src_configure() { - # -Werror=odr - # https://bugs.gentoo.org/881107 - # Seems to be fixed in git (1.4.9999) - filter-lto - - unset FLTK_LIBDIRS - - local FLTK_INCDIR=${EPREFIX}/usr/include/fltk - local FLTK_LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk - FLTK_LIBDIRS+=${FLTK_LIBDIRS+:}${FLTK_LIBDIR} - - multilib_is_native_abi && use prefix && - append-ldflags -Wl,-rpath -Wl,"${FLTK_LIBDIR}" - - econf \ - $(use_enable cairo) \ - $(use_enable debug) \ - $(use_enable opengl gl) \ - $(use_enable threads) \ - $(use_enable xft) \ - $(use_enable xinerama) \ - --disable-localjpeg \ - --disable-localpng \ - --disable-localzlib \ - --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ - --enable-largefile \ - --enable-shared \ - --enable-xcursor \ - --enable-xdbe \ - --enable-xfixes \ - --includedir=${FLTK_INCDIR} \ - --libdir=${FLTK_LIBDIR} \ - DSOFLAGS="${LDFLAGS}" \ - LDFLAGS="${LDFLAGS}" -} - -multilib_src_compile() { - # Prevent reconfigure on non-native ABIs. - touch -r makeinclude config.{guess,sub} || die - - default - - if multilib_is_native_abi; then - emake -C fluid - use doc && emake -C documentation html - use games && emake -C test ${FLTK_GAMES} - fi -} - -multilib_src_test() { - emake -C fluid - emake -C test -} - -multilib_src_install() { - default - - if multilib_is_native_abi; then - emake -C fluid DESTDIR="${D}" install-linux install - - use doc && \ - emake -C documentation DESTDIR="${D}" install - - use games && \ - emake -C test DESTDIR="${D}" install-linux - fi -} - -multilib_src_install_all() { - for app in fluid $(usex games "${FLTK_GAMES}" ''); do - dosym \ - ../icons/hicolor/32x32/apps/${app}.png \ - /usr/share/pixmaps/${app}.png - done - - if use examples; then - docinto examples - dodoc -r test/*.{h,cxx,fl} test/demo.menu - fi - - insinto /usr/share/cmake/Modules - doins CMake/FLTK*.cmake - - echo "LDPATH=${FLTK_LIBDIRS}" > 99fltk || die - echo "FLTK_DOCDIR=${EPREFIX}/usr/share/doc/${PF}/html" >> 99fltk || die - doenvd 99fltk - - # FIXME: This is bad, but building only shared libraries is hardly supported - # FIXME: The executables in test/ are linking statically against libfltk - if ! use static-libs; then - rm "${ED}"/usr/lib*/fltk/*.a || die - fi - - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/x11-libs/fltk/fltk-1.3.9999.ebuild b/x11-libs/fltk/fltk-1.3.9999.ebuild deleted file mode 100644 index 8362de128971..000000000000 --- a/x11-libs/fltk/fltk-1.3.9999.ebuild +++ /dev/null @@ -1,207 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic git-r3 xdg-utils multilib-minimal - -DESCRIPTION="C++ user interface toolkit for X and OpenGL" -HOMEPAGE="https://www.fltk.org/" -EGIT_REPO_URI="https://github.com/fltk/fltk" -EGIT_OVERRIDE_BRANCH_FLTK_FLTK="branch-1.3" - -SLOT="1" -LICENSE="FLTK LGPL-2" -KEYWORDS="" -IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama" - -RDEPEND=" - >=media-libs/libpng-1.2:0=[${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] - virtual/jpeg:0=[${MULTILIB_USEDEP}] - x11-libs/libICE[${MULTILIB_USEDEP}] - x11-libs/libSM[${MULTILIB_USEDEP}] - x11-libs/libXcursor[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - x11-libs/libXfixes[${MULTILIB_USEDEP}] - x11-libs/libXt[${MULTILIB_USEDEP}] - cairo? ( x11-libs/cairo[${MULTILIB_USEDEP},X] ) - games? ( !sys-block/blocks ) - opengl? ( - virtual/glu[${MULTILIB_USEDEP}] - virtual/opengl[${MULTILIB_USEDEP}] - ) - xft? ( x11-libs/libXft[${MULTILIB_USEDEP}] ) - xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto - doc? ( app-text/doxygen ) -" -DOCS=( - ANNOUNCEMENT - CHANGES - CHANGES_1.0 - CHANGES_1.1 - CREDITS - README - README.abi-version.txt - README.Cairo.txt - README.CMake.txt - README.MSWindows.txt - README.OSX.txt - README.Unix.txt -) -FLTK_GAMES=" - blocks - checkers - sudoku -" -PATCHES=( - "${FILESDIR}"/${PN}-1.3.0-share.patch - "${FILESDIR}"/${PN}-1.3.9999-conf-tests.patch - "${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch - "${FILESDIR}"/${PN}-1.3.3-visibility.patch - "${FILESDIR}"/${PN}-1.3.5-cmake.patch - "${FILESDIR}"/${PN}-1.3.5-optim.patch -) - -pkg_setup() { - unset FLTK_LIBDIRS -} - -src_prepare() { - default - - rm -rf zlib jpeg png || die - - sed -i \ - -e 's:@HLINKS@::g' FL/Makefile.in || die - sed -i \ - -e '/x-fluid/d' fluid/Makefile || die - sed -i \ - -e '/C\(XX\)\?FLAGS=/s:@C\(XX\)\?FLAGS@::' \ - -e '/^LDFLAGS=/d' \ - "${S}/fltk-config.in" || die - # docs in proper docdir - sed -i \ - -e "/^docdir/s:fltk:${PF}/html:" \ - -e "/SILENT:/d" \ - makeinclude.in || die - - # also in Makefile:config.guess config.sub: - cp misc/config.{guess,sub} . || die - - eautoconf - multilib_copy_sources -} - -multilib_src_configure() { - # -Werror=odr - # https://bugs.gentoo.org/881107 - # Seems to be fixed in git (1.4.9999) - filter-lto - - local FLTK_INCDIR=${EPREFIX}/usr/include/fltk - local FLTK_LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk - FLTK_LIBDIRS+=${FLTK_LIBDIRS+:}${FLTK_LIBDIR} - - multilib_is_native_abi && use prefix && - append-ldflags -Wl,-rpath -Wl,"${FLTK_LIBDIR}" - - econf \ - $(use_enable cairo) \ - $(use_enable debug) \ - $(use_enable opengl gl) \ - $(use_enable threads) \ - $(use_enable xft) \ - $(use_enable xinerama) \ - --disable-localjpeg \ - --disable-localpng \ - --disable-localzlib \ - --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ - --enable-largefile \ - --enable-shared \ - --enable-xcursor \ - --enable-xdbe \ - --enable-xfixes \ - --includedir=${FLTK_INCDIR} \ - --libdir=${FLTK_LIBDIR} \ - DSOFLAGS="${LDFLAGS}" \ - LDFLAGS="${LDFLAGS}" -} - -multilib_src_compile() { - # Prevent reconfigure on non-native ABIs. - touch -r makeinclude config.{guess,sub} || die - - default - - if multilib_is_native_abi; then - emake -C fluid - use doc && emake -C documentation html - use games && emake -C test ${FLTK_GAMES} - fi -} - -multilib_src_test() { - emake -C fluid - emake -C test -} - -multilib_src_install() { - default - - if multilib_is_native_abi; then - emake -C fluid \ - DESTDIR="${D}" install-linux install - - use doc && - emake -C documentation \ - DESTDIR="${D}" install - - use games && - emake -C test \ - DESTDIR="${D}" install-linux - fi -} - -multilib_src_install_all() { - for app in fluid $(usex games "${FLTK_GAMES}" ''); do - dosym \ - ../icons/hicolor/32x32/apps/${app}.png \ - /usr/share/pixmaps/${app}.png - done - - if use examples; then - docinto examples - dodoc -r test/*.{h,cxx,fl} test/demo.menu - fi - - insinto /usr/share/cmake/Modules - doins CMake/FLTK*.cmake - - echo "LDPATH=${FLTK_LIBDIRS}" > 99fltk || die - echo "FLTK_DOCDIR=${EPREFIX}/usr/share/doc/${PF}/html" >> 99fltk || die - doenvd 99fltk - - # FIXME: This is bad, but building only shared libraries is hardly supported - # FIXME: The executables in test/ are linking statically against libfltk - if ! use static-libs; then - rm "${ED}"/usr/lib*/fltk/*.a || die - fi - - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/x11-libs/fltk/fltk-1.4.9999.ebuild b/x11-libs/fltk/fltk-1.4.9999.ebuild deleted file mode 100644 index 74b44b10b0b6..000000000000 --- a/x11-libs/fltk/fltk-1.4.9999.ebuild +++ /dev/null @@ -1,200 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic git-r3 xdg-utils multilib-minimal - -DESCRIPTION="C++ user interface toolkit for X and OpenGL" -HOMEPAGE="https://www.fltk.org/" -EGIT_REPO_URI="https://github.com/fltk/fltk" - -SLOT="1" -LICENSE="FLTK LGPL-2" -KEYWORDS="" -IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama" - -RDEPEND=" - >=media-libs/libpng-1.2:0=[${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] - virtual/jpeg:0=[${MULTILIB_USEDEP}] - x11-libs/libICE[${MULTILIB_USEDEP}] - x11-libs/libSM[${MULTILIB_USEDEP}] - x11-libs/libXcursor[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - x11-libs/libXfixes[${MULTILIB_USEDEP}] - x11-libs/libXt[${MULTILIB_USEDEP}] - cairo? ( x11-libs/cairo[${MULTILIB_USEDEP},X] ) - games? ( !sys-block/blocks ) - opengl? ( - virtual/glu[${MULTILIB_USEDEP}] - virtual/opengl[${MULTILIB_USEDEP}] - ) - xft? ( x11-libs/libXft[${MULTILIB_USEDEP}] ) - xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto - doc? ( app-text/doxygen ) -" -DOCS=( - ANNOUNCEMENT - CHANGES.txt - CHANGES_1.0.txt - CHANGES_1.1.txt - CHANGES_1.3.txt - CREDITS.txt - README.CMake.txt - README.Cairo.txt - README.IDE.txt - README.Unix.txt - README.Windows.txt - README.abi-version.txt - README.macOS.md - README.md - README.txt -) -FLTK_GAMES=" - blocks - checkers - sudoku -" -PATCHES=( - "${FILESDIR}"/${PN}-1.3.0-share.patch - "${FILESDIR}"/${PN}-1.4.9999-makefile-dirs.patch - "${FILESDIR}"/${PN}-1.4.9999-conf-tests.patch - "${FILESDIR}"/${PN}-1.4.9999-cmake.patch - "${FILESDIR}"/${PN}-1.4.9999-optim.patch -) - -pkg_setup() { - unset FLTK_LIBDIRS -} - -src_prepare() { - default - - rm -rf zlib jpeg png || die - - sed -i \ - -e 's:@HLINKS@::g' FL/Makefile.in || die - sed -i \ - -e '/x-fluid/d' fluid/Makefile || die - sed -i \ - -e '/C\(XX\)\?FLAGS=/s:@C\(XX\)\?FLAGS@::' \ - -e '/^LDFLAGS=/d' \ - "${S}/fltk-config.in" || die - # docs in proper docdir - sed -i \ - -e "/^docdir/s:fltk:${PF}/html:" \ - -e "/SILENT:/d" \ - makeinclude.in || die - - eautoconf - multilib_copy_sources -} - -multilib_src_configure() { - local FLTK_INCDIR=${EPREFIX}/usr/include/fltk - local FLTK_LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk - FLTK_LIBDIRS+=${FLTK_LIBDIRS+:}${FLTK_LIBDIR} - - multilib_is_native_abi && use prefix && - append-ldflags -Wl,-rpath -Wl,"${FLTK_LIBDIR}" - - econf \ - $(use_enable cairo) \ - $(use_enable debug) \ - $(use_enable opengl gl) \ - $(use_enable threads) \ - $(use_enable xft) \ - $(use_enable xinerama) \ - --disable-localjpeg \ - --disable-localpng \ - --disable-localzlib \ - --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ - --enable-largefile \ - --enable-shared \ - --enable-xcursor \ - --enable-xdbe \ - --enable-xfixes \ - --includedir=${FLTK_INCDIR} \ - --libdir=${FLTK_LIBDIR} \ - DSOFLAGS="${LDFLAGS}" \ - LDFLAGS="${LDFLAGS}" -} - -multilib_src_compile() { - # Prevent reconfigure on non-native ABIs. - touch -r makeinclude config.{guess,sub} || die - - default - - if multilib_is_native_abi; then - emake -C fluid - use doc && emake -C documentation html - use games && emake -C test ${FLTK_GAMES} - fi -} - -multilib_src_test() { - emake -C fluid - emake -C test -} - -multilib_src_install() { - default - - if multilib_is_native_abi; then - emake -C fluid \ - DESTDIR="${D}" install-linux install - - use doc && - emake -C documentation \ - DESTDIR="${D}" install - - use games && - emake -C test \ - DESTDIR="${D}" install-linux - fi -} - -multilib_src_install_all() { - for app in fluid $(usex games "${FLTK_GAMES}" ''); do - dosym \ - ../icons/hicolor/32x32/apps/${app}.png \ - /usr/share/pixmaps/${app}.png - done - - if use examples; then - docinto examples - dodoc -r test/*.{h,cxx,fl} test/demo.menu - fi - - insinto /usr/share/cmake/Modules - doins CMake/FLTK*.cmake - - echo "LDPATH=${FLTK_LIBDIRS}" > 99fltk || die - echo "FLTK_DOCDIR=${EPREFIX}/usr/share/doc/${PF}/html" >> 99fltk || die - doenvd 99fltk - - # FIXME: This is bad, but building only shared libraries is hardly supported - # FIXME: The executables in test/ are linking statically against libfltk - if ! use static-libs; then - rm "${ED}"/usr/lib*/fltk/*.a || die - fi - - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} -- cgit v1.2.3-65-gdbad From 4249329bdf75a9191fc91e23196338dc3432e40b Mon Sep 17 00:00:00 2001 From: Ionen Wolkens <ionen@gentoo.org> Date: Wed, 25 Dec 2024 05:53:48 -0500 Subject: x11-libs/fltk: fix VariableOrderWrong in old Signed-off-by: Ionen Wolkens <ionen@gentoo.org> --- x11-libs/fltk/fltk-1.3.8.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-libs/fltk/fltk-1.3.8.ebuild b/x11-libs/fltk/fltk-1.3.8.ebuild index af7fb86ee352..d9363b758188 100644 --- a/x11-libs/fltk/fltk-1.3.8.ebuild +++ b/x11-libs/fltk/fltk-1.3.8.ebuild @@ -9,8 +9,8 @@ DESCRIPTION="C++ user interface toolkit for X and OpenGL" HOMEPAGE="https://www.fltk.org/" SRC_URI="https://www.fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz" -SLOT="1" LICENSE="FLTK LGPL-2" +SLOT="1" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama" -- cgit v1.2.3-65-gdbad From fb67aa178817cbe706f36348f1e1709bbc851c28 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens <ionen@gentoo.org> Date: Thu, 26 Dec 2024 01:33:30 -0500 Subject: app-text/flpsed: add binding := to fltk, soname changed Also cleanup lower bound, <1.3.0 is long gone. Signed-off-by: Ionen Wolkens <ionen@gentoo.org> --- app-text/flpsed/flpsed-0.7.3-r1.ebuild | 32 ++++++++++++++++++++++++++++++++ app-text/flpsed/flpsed-0.7.3.ebuild | 32 -------------------------------- 2 files changed, 32 insertions(+), 32 deletions(-) create mode 100644 app-text/flpsed/flpsed-0.7.3-r1.ebuild delete mode 100644 app-text/flpsed/flpsed-0.7.3.ebuild diff --git a/app-text/flpsed/flpsed-0.7.3-r1.ebuild b/app-text/flpsed/flpsed-0.7.3-r1.ebuild new file mode 100644 index 000000000000..03d758514c35 --- /dev/null +++ b/app-text/flpsed/flpsed-0.7.3-r1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop xdg + +DESCRIPTION="Pseudo PostScript editor" +HOMEPAGE="https://flpsed.org/flpsed.html" +SRC_URI="https://flpsed.org/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" + +RDEPEND=" + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXft + x11-libs/fltk:1= + app-text/ghostscript-gpl[X]" +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}"/${PN}-0.7.2-desktop.patch ) + +src_install() { + default + + doicon ${PN}.png + doicon -s scalable ${PN}.svg + domenu ${PN}.desktop +} diff --git a/app-text/flpsed/flpsed-0.7.3.ebuild b/app-text/flpsed/flpsed-0.7.3.ebuild deleted file mode 100644 index f3c15f0bc3f0..000000000000 --- a/app-text/flpsed/flpsed-0.7.3.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop xdg - -DESCRIPTION="Pseudo PostScript editor" -HOMEPAGE="https://flpsed.org/flpsed.html" -SRC_URI="https://flpsed.org/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -RDEPEND=" - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXft - >=x11-libs/fltk-1.3.0:1 - app-text/ghostscript-gpl[X]" -DEPEND="${RDEPEND}" - -PATCHES=( "${FILESDIR}"/${PN}-0.7.2-desktop.patch ) - -src_install() { - default - - doicon ${PN}.png - doicon -s scalable ${PN}.svg - domenu ${PN}.desktop -} -- cgit v1.2.3-65-gdbad From 2a1eb2ed7a492be2478a50ba318d9483b1ae2e45 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens <ionen@gentoo.org> Date: Thu, 26 Dec 2024 01:34:56 -0500 Subject: app-text/htmldoc: add binding := to fltk, soname changed Signed-off-by: Ionen Wolkens <ionen@gentoo.org> --- app-text/htmldoc/htmldoc-1.9.16-r1.ebuild | 52 +++++++++++++++++++++++++++++++ app-text/htmldoc/htmldoc-1.9.16.ebuild | 52 ------------------------------- 2 files changed, 52 insertions(+), 52 deletions(-) create mode 100644 app-text/htmldoc/htmldoc-1.9.16-r1.ebuild delete mode 100644 app-text/htmldoc/htmldoc-1.9.16.ebuild diff --git a/app-text/htmldoc/htmldoc-1.9.16-r1.ebuild b/app-text/htmldoc/htmldoc-1.9.16-r1.ebuild new file mode 100644 index 000000000000..b8b0c0252702 --- /dev/null +++ b/app-text/htmldoc/htmldoc-1.9.16-r1.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools toolchain-funcs xdg + +DESCRIPTION="Convert HTML pages into a PDF document" +HOMEPAGE="https://www.msweet.org/htmldoc/" +SRC_URI="https://github.com/michaelrsweet/${PN}/releases/download/v${PV}/${P}-source.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86" +IUSE="fltk ssl" + +BDEPEND="virtual/pkgconfig" +DEPEND=" + media-libs/libjpeg-turbo:= + >=media-libs/libpng-1.4:0= + sys-libs/zlib + ssl? ( net-libs/gnutls:= ) + fltk? ( x11-libs/fltk:1= ) +" +RDEPEND="${DEPEND}" + +src_prepare() { + default + eautoreconf + + # Fix the documentation path in a few places. Some Makefiles aren't + # autotoolized =( + for file in configure doc/Makefile doc/htmldoc.man; do + sed -i "${file}" \ + -e "s:/doc/htmldoc:/doc/${PF}/html:g" \ + || die "failed to fix documentation path in ${file}" + done +} + +src_configure() { + local myeconfargs=( + $(use_with fltk gui) + $(use_enable ssl) + $(use_enable ssl gnutls) + ) + + CC="$(tc-getCC)" CXX="$(tc-getCXX)" econf "${myeconfargs[@]}" +} + +src_install() { + emake STRIPPROG="true" DSTROOT="${ED}" install +} diff --git a/app-text/htmldoc/htmldoc-1.9.16.ebuild b/app-text/htmldoc/htmldoc-1.9.16.ebuild deleted file mode 100644 index ec6a43befe4d..000000000000 --- a/app-text/htmldoc/htmldoc-1.9.16.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools toolchain-funcs xdg - -DESCRIPTION="Convert HTML pages into a PDF document" -HOMEPAGE="https://www.msweet.org/htmldoc/" -SRC_URI="https://github.com/michaelrsweet/${PN}/releases/download/v${PV}/${P}-source.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86" -IUSE="fltk ssl" - -BDEPEND="virtual/pkgconfig" -DEPEND=" - media-libs/libjpeg-turbo:= - >=media-libs/libpng-1.4:0= - sys-libs/zlib - ssl? ( net-libs/gnutls:= ) - fltk? ( x11-libs/fltk:1 ) -" -RDEPEND="${DEPEND}" - -src_prepare() { - default - eautoreconf - - # Fix the documentation path in a few places. Some Makefiles aren't - # autotoolized =( - for file in configure doc/Makefile doc/htmldoc.man; do - sed -i "${file}" \ - -e "s:/doc/htmldoc:/doc/${PF}/html:g" \ - || die "failed to fix documentation path in ${file}" - done -} - -src_configure() { - local myeconfargs=( - $(use_with fltk gui) - $(use_enable ssl) - $(use_enable ssl gnutls) - ) - - CC="$(tc-getCC)" CXX="$(tc-getCXX)" econf "${myeconfargs[@]}" -} - -src_install() { - emake STRIPPROG="true" DSTROOT="${ED}" install -} -- cgit v1.2.3-65-gdbad From cbd28b7ed851bbb485e52546617423c1e038a214 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens <ionen@gentoo.org> Date: Thu, 26 Dec 2024 11:40:28 -0500 Subject: dev-games/openscenegraph-openmw: add := to fltk, soname changed Skip revbump, it's a big package and the fltk dependency is kind of obscure (examples->fltk, both off by default). Signed-off-by: Ionen Wolkens <ionen@gentoo.org> --- .../openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115-r1.ebuild b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115-r1.ebuild index ebb83fce663a..3c35af98da4d 100644 --- a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115-r1.ebuild +++ b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115-r1.ebuild @@ -49,7 +49,7 @@ RDEPEND=" collada? ( dev-libs/collada-dom:= ) curl? ( net-misc/curl ) examples? ( - fltk? ( x11-libs/fltk:1[opengl] ) + fltk? ( x11-libs/fltk:1=[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] ) -- cgit v1.2.3-65-gdbad From cb973a1893c7680c44519481dde5858719c752e7 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens <ionen@gentoo.org> Date: Thu, 26 Dec 2024 11:38:51 -0500 Subject: dev-games/openscenegraph: add := to fltk, soname changed Skip revbump, it's a big package and the fltk dependency is kind of obscure (examples->fltk, both off by default). Signed-off-by: Ionen Wolkens <ionen@gentoo.org> --- dev-games/openscenegraph/openscenegraph-3.6.5-r114.ebuild | 2 +- dev-games/openscenegraph/openscenegraph-3.6.5-r115.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-games/openscenegraph/openscenegraph-3.6.5-r114.ebuild b/dev-games/openscenegraph/openscenegraph-3.6.5-r114.ebuild index f1e25ba3592f..06525d8ef4b1 100644 --- a/dev-games/openscenegraph/openscenegraph-3.6.5-r114.ebuild +++ b/dev-games/openscenegraph/openscenegraph-3.6.5-r114.ebuild @@ -49,7 +49,7 @@ RDEPEND=" collada? ( dev-libs/collada-dom:= ) curl? ( net-misc/curl ) examples? ( - fltk? ( x11-libs/fltk:1[opengl] ) + fltk? ( x11-libs/fltk:1=[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) sdl2? ( media-libs/libsdl2 ) diff --git a/dev-games/openscenegraph/openscenegraph-3.6.5-r115.ebuild b/dev-games/openscenegraph/openscenegraph-3.6.5-r115.ebuild index ee7b9e55301c..4fa510fea12b 100644 --- a/dev-games/openscenegraph/openscenegraph-3.6.5-r115.ebuild +++ b/dev-games/openscenegraph/openscenegraph-3.6.5-r115.ebuild @@ -49,7 +49,7 @@ RDEPEND=" collada? ( dev-libs/collada-dom:= ) curl? ( net-misc/curl ) examples? ( - fltk? ( x11-libs/fltk:1[opengl] ) + fltk? ( x11-libs/fltk:1=[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) sdl2? ( media-libs/libsdl2 ) -- cgit v1.2.3-65-gdbad From aa31e4cc3763bdaaa0123ac39ce54187324d0b73 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens <ionen@gentoo.org> Date: Thu, 26 Dec 2024 01:37:22 -0500 Subject: games-emulation/nestopia: add binding := to fltk, soname changed Also add the lower bound to latest version while at it (after all) given the upstream recommendation. Bug: https://bugs.gentoo.org/946882 Signed-off-by: Ionen Wolkens <ionen@gentoo.org> --- games-emulation/nestopia/nestopia-1.52.1-r1.ebuild | 44 +++++++++++++++++++++ games-emulation/nestopia/nestopia-1.52.1.ebuild | 44 --------------------- games-emulation/nestopia/nestopia-1.53.0-r1.ebuild | 45 ++++++++++++++++++++++ games-emulation/nestopia/nestopia-1.53.0.ebuild | 45 ---------------------- 4 files changed, 89 insertions(+), 89 deletions(-) create mode 100644 games-emulation/nestopia/nestopia-1.52.1-r1.ebuild delete mode 100644 games-emulation/nestopia/nestopia-1.52.1.ebuild create mode 100644 games-emulation/nestopia/nestopia-1.53.0-r1.ebuild delete mode 100644 games-emulation/nestopia/nestopia-1.53.0.ebuild diff --git a/games-emulation/nestopia/nestopia-1.52.1-r1.ebuild b/games-emulation/nestopia/nestopia-1.52.1-r1.ebuild new file mode 100644 index 000000000000..d859412937c6 --- /dev/null +++ b/games-emulation/nestopia/nestopia-1.52.1-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic xdg + +DESCRIPTION="Portable Nintendo Entertainment System emulator written in C++" +HOMEPAGE="http://0ldsk00l.ca/nestopia/" +SRC_URI=" + https://github.com/0ldsk00l/nestopia/archive/refs/tags/${PV}.tar.gz + -> ${P}.tar.gz +" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc" + +RDEPEND=" + app-arch/libarchive:= + media-libs/libglvnd + media-libs/libsdl2[joystick,sound] + sys-libs/zlib:= + x11-libs/fltk:1=[opengl] +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-build/autoconf-archive + virtual/pkgconfig +" + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + # silence the narrowing warnings on clang (bug #830469) + append-cxxflags -Wno-narrowing + + econf $(use_enable doc) +} diff --git a/games-emulation/nestopia/nestopia-1.52.1.ebuild b/games-emulation/nestopia/nestopia-1.52.1.ebuild deleted file mode 100644 index f052df2b46cc..000000000000 --- a/games-emulation/nestopia/nestopia-1.52.1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic xdg - -DESCRIPTION="Portable Nintendo Entertainment System emulator written in C++" -HOMEPAGE="http://0ldsk00l.ca/nestopia/" -SRC_URI=" - https://github.com/0ldsk00l/nestopia/archive/refs/tags/${PV}.tar.gz - -> ${P}.tar.gz -" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc" - -RDEPEND=" - app-arch/libarchive:= - media-libs/libglvnd - media-libs/libsdl2[joystick,sound] - sys-libs/zlib:= - x11-libs/fltk:1[opengl] -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-build/autoconf-archive - virtual/pkgconfig -" - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - # silence the narrowing warnings on clang (bug #830469) - append-cxxflags -Wno-narrowing - - econf $(use_enable doc) -} diff --git a/games-emulation/nestopia/nestopia-1.53.0-r1.ebuild b/games-emulation/nestopia/nestopia-1.53.0-r1.ebuild new file mode 100644 index 000000000000..443027ed1239 --- /dev/null +++ b/games-emulation/nestopia/nestopia-1.53.0-r1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic xdg + +DESCRIPTION="Portable Nintendo Entertainment System emulator written in C++" +HOMEPAGE="http://0ldsk00l.ca/nestopia/" +SRC_URI=" + https://github.com/0ldsk00l/nestopia/archive/refs/tags/${PV}.tar.gz + -> ${P}.tar.gz +" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc" + +RDEPEND=" + app-arch/libarchive:= + media-libs/libepoxy + media-libs/libsamplerate + media-libs/libsdl2[joystick,sound] + sys-libs/zlib:= + >=x11-libs/fltk-1.4:1=[opengl] +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-build/autoconf-archive + virtual/pkgconfig +" + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + # silence the narrowing warnings on clang (bug #830469) + append-cxxflags -Wno-narrowing + + econf $(use_enable doc) +} diff --git a/games-emulation/nestopia/nestopia-1.53.0.ebuild b/games-emulation/nestopia/nestopia-1.53.0.ebuild deleted file mode 100644 index bfe33153ee28..000000000000 --- a/games-emulation/nestopia/nestopia-1.53.0.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic xdg - -DESCRIPTION="Portable Nintendo Entertainment System emulator written in C++" -HOMEPAGE="http://0ldsk00l.ca/nestopia/" -SRC_URI=" - https://github.com/0ldsk00l/nestopia/archive/refs/tags/${PV}.tar.gz - -> ${P}.tar.gz -" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc" - -RDEPEND=" - app-arch/libarchive:= - media-libs/libepoxy - media-libs/libsamplerate - media-libs/libsdl2[joystick,sound] - sys-libs/zlib:= - x11-libs/fltk:1[opengl] -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-build/autoconf-archive - virtual/pkgconfig -" - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - # silence the narrowing warnings on clang (bug #830469) - append-cxxflags -Wno-narrowing - - econf $(use_enable doc) -} -- cgit v1.2.3-65-gdbad From fa40076248129f848323ba6f049eee9f6f278ae5 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens <ionen@gentoo.org> Date: Thu, 26 Dec 2024 01:40:22 -0500 Subject: games-engines/odamex: add binding := to fltk, soname changed wrt bug #946882 comment #4, can likely get rid of USE=hidpi but haven't experimented with that so only adding the binding operator like other packages myself. Bug: https://bugs.gentoo.org/946882 Signed-off-by: Ionen Wolkens <ionen@gentoo.org> --- games-engines/odamex/odamex-10.6.0-r1.ebuild | 89 --------------------------- games-engines/odamex/odamex-10.6.0-r2.ebuild | 90 ++++++++++++++++++++++++++++ games-engines/odamex/odamex-10.6.0-r3.ebuild | 89 +++++++++++++++++++++++++++ games-engines/odamex/odamex-10.6.0.ebuild | 90 ---------------------------- 4 files changed, 179 insertions(+), 179 deletions(-) delete mode 100644 games-engines/odamex/odamex-10.6.0-r1.ebuild create mode 100644 games-engines/odamex/odamex-10.6.0-r2.ebuild create mode 100644 games-engines/odamex/odamex-10.6.0-r3.ebuild delete mode 100644 games-engines/odamex/odamex-10.6.0.ebuild diff --git a/games-engines/odamex/odamex-10.6.0-r1.ebuild b/games-engines/odamex/odamex-10.6.0-r1.ebuild deleted file mode 100644 index 504ec274d098..000000000000 --- a/games-engines/odamex/odamex-10.6.0-r1.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -WX_GTK_VER="3.2-gtk3" -inherit cmake desktop prefix wxwidgets xdg - -DESCRIPTION="Online multiplayer free software engine for DOOM" -HOMEPAGE="https://odamex.net/" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${PN}-src-${PV}.tar.xz" -S="${WORKDIR}/${PN}-src-${PV}" -LICENSE="GPL-2+ MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="+client hidpi master +odalaunch portmidi server upnp" -REQUIRED_USE="|| ( client master server )" - -# protobuf is still bundled. Unfortunately an old version is required for C++98 -# compatibility. We could use C++11, but upstream is concerned about using a -# completely different protobuf version on a multiplayer-focused engine. - -RDEPEND=" - client? ( - media-libs/libpng:0= - media-libs/libsdl2[joystick,sound,video] - media-libs/sdl2-mixer - net-misc/curl - x11-libs/libX11 - !hidpi? ( x11-libs/fltk:1 ) - portmidi? ( media-libs/portmidi ) - ) - odalaunch? ( x11-libs/wxGTK:${WX_GTK_VER} ) - server? ( - dev-libs/jsoncpp:= - upnp? ( net-libs/miniupnpc:= ) - )" -DEPEND="${RDEPEND}" -BDEPEND="games-util/deutex" - -PATCHES=( - "${FILESDIR}"/${PN}-10.3.0-unbundle-fltk.patch - "${FILESDIR}"/${P}-odalaunch-sorting-crash.patch -) - -src_prepare() { - rm -r libraries/miniupnp || die - hprefixify common/d_main.cpp - - cmake_src_prepare -} - -src_configure() { - use odalaunch && setup-wxwidgets - - local mycmakeargs=( - -DUSE_INTERNAL_FLTK=$(usex hidpi) - -DUSE_INTERNAL_JSONCPP=0 - -DUSE_INTERNAL_LIBS=0 - -DUSE_INTERNAL_MINIUPNP=0 - -DBUILD_CLIENT=$(usex client) - -DBUILD_LAUNCHER=$(usex odalaunch) - -DBUILD_MASTER=$(usex master) - -DBUILD_SERVER=$(usex server) - -DBUILD_OR_FAIL=1 - -DENABLE_PORTMIDI=$(usex portmidi) - -DUSE_MINIUPNP=$(usex upnp) - ) - - cmake_src_configure -} - -src_install() { - if use client ; then - for size in 96 128 256 512; do - newicon -s ${size} "${S}/media/icon_${PN}_${size}.png" "${PN}.png" - done - make_desktop_entry "${PN}" "Odamex" - - if use odalaunch ; then - for size in 96 128 256 512; do - newicon -s ${size} "${S}/media/icon_odalaunch_${size}.png" "odalaunch.png" - done - make_desktop_entry odalaunch "Odamex Launcher" odalaunch - fi - fi - - cmake_src_install -} diff --git a/games-engines/odamex/odamex-10.6.0-r2.ebuild b/games-engines/odamex/odamex-10.6.0-r2.ebuild new file mode 100644 index 000000000000..c5b40b14bfe1 --- /dev/null +++ b/games-engines/odamex/odamex-10.6.0-r2.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# odalaunch crashes with 3.2. Check it before updating! +# https://github.com/odamex/odamex/issues/879 +WX_GTK_VER="3.0-gtk3" +inherit cmake desktop prefix wxwidgets xdg + +DESCRIPTION="Online multiplayer free software engine for DOOM" +HOMEPAGE="https://odamex.net/" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${PN}-src-${PV}.tar.xz" +S="${WORKDIR}/${PN}-src-${PV}" +LICENSE="GPL-2+ MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="+client hidpi master +odalaunch portmidi server upnp" +REQUIRED_USE="|| ( client master server )" + +# protobuf is still bundled. Unfortunately an old version is required for C++98 +# compatibility. We could use C++11, but upstream is concerned about using a +# completely different protobuf version on a multiplayer-focused engine. + +RDEPEND=" + client? ( + media-libs/libpng:0= + media-libs/libsdl2[joystick,sound,video] + media-libs/sdl2-mixer + net-misc/curl + x11-libs/libX11 + !hidpi? ( x11-libs/fltk:1= ) + portmidi? ( media-libs/portmidi ) + ) + odalaunch? ( x11-libs/wxGTK:${WX_GTK_VER} ) + server? ( + dev-libs/jsoncpp:= + upnp? ( net-libs/miniupnpc:= ) + )" +DEPEND="${RDEPEND}" +BDEPEND="games-util/deutex" + +PATCHES=( + "${FILESDIR}"/${PN}-10.3.0-unbundle-fltk.patch +) + +src_prepare() { + rm -r libraries/miniupnp || die + hprefixify common/d_main.cpp + + use odalaunch && setup-wxwidgets + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DUSE_INTERNAL_FLTK=$(usex hidpi) + -DUSE_INTERNAL_JSONCPP=0 + -DUSE_INTERNAL_LIBS=0 + -DUSE_INTERNAL_MINIUPNP=0 + -DBUILD_CLIENT=$(usex client) + -DBUILD_LAUNCHER=$(usex odalaunch) + -DBUILD_MASTER=$(usex master) + -DBUILD_SERVER=$(usex server) + -DBUILD_OR_FAIL=1 + -DENABLE_PORTMIDI=$(usex portmidi) + -DUSE_MINIUPNP=$(usex upnp) + ) + + cmake_src_configure +} + +src_install() { + if use client ; then + for size in 96 128 256 512; do + newicon -s ${size} "${S}/media/icon_${PN}_${size}.png" "${PN}.png" + done + make_desktop_entry "${PN}" "Odamex" + + if use odalaunch ; then + for size in 96 128 256 512; do + newicon -s ${size} "${S}/media/icon_odalaunch_${size}.png" "odalaunch.png" + done + make_desktop_entry odalaunch "Odamex Launcher" odalaunch + fi + fi + + cmake_src_install +} diff --git a/games-engines/odamex/odamex-10.6.0-r3.ebuild b/games-engines/odamex/odamex-10.6.0-r3.ebuild new file mode 100644 index 000000000000..2cb5b49ef1cd --- /dev/null +++ b/games-engines/odamex/odamex-10.6.0-r3.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +WX_GTK_VER="3.2-gtk3" +inherit cmake desktop prefix wxwidgets xdg + +DESCRIPTION="Online multiplayer free software engine for DOOM" +HOMEPAGE="https://odamex.net/" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${PN}-src-${PV}.tar.xz" +S="${WORKDIR}/${PN}-src-${PV}" +LICENSE="GPL-2+ MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="+client hidpi master +odalaunch portmidi server upnp" +REQUIRED_USE="|| ( client master server )" + +# protobuf is still bundled. Unfortunately an old version is required for C++98 +# compatibility. We could use C++11, but upstream is concerned about using a +# completely different protobuf version on a multiplayer-focused engine. + +RDEPEND=" + client? ( + media-libs/libpng:0= + media-libs/libsdl2[joystick,sound,video] + media-libs/sdl2-mixer + net-misc/curl + x11-libs/libX11 + !hidpi? ( x11-libs/fltk:1= ) + portmidi? ( media-libs/portmidi ) + ) + odalaunch? ( x11-libs/wxGTK:${WX_GTK_VER} ) + server? ( + dev-libs/jsoncpp:= + upnp? ( net-libs/miniupnpc:= ) + )" +DEPEND="${RDEPEND}" +BDEPEND="games-util/deutex" + +PATCHES=( + "${FILESDIR}"/${PN}-10.3.0-unbundle-fltk.patch + "${FILESDIR}"/${P}-odalaunch-sorting-crash.patch +) + +src_prepare() { + rm -r libraries/miniupnp || die + hprefixify common/d_main.cpp + + cmake_src_prepare +} + +src_configure() { + use odalaunch && setup-wxwidgets + + local mycmakeargs=( + -DUSE_INTERNAL_FLTK=$(usex hidpi) + -DUSE_INTERNAL_JSONCPP=0 + -DUSE_INTERNAL_LIBS=0 + -DUSE_INTERNAL_MINIUPNP=0 + -DBUILD_CLIENT=$(usex client) + -DBUILD_LAUNCHER=$(usex odalaunch) + -DBUILD_MASTER=$(usex master) + -DBUILD_SERVER=$(usex server) + -DBUILD_OR_FAIL=1 + -DENABLE_PORTMIDI=$(usex portmidi) + -DUSE_MINIUPNP=$(usex upnp) + ) + + cmake_src_configure +} + +src_install() { + if use client ; then + for size in 96 128 256 512; do + newicon -s ${size} "${S}/media/icon_${PN}_${size}.png" "${PN}.png" + done + make_desktop_entry "${PN}" "Odamex" + + if use odalaunch ; then + for size in 96 128 256 512; do + newicon -s ${size} "${S}/media/icon_odalaunch_${size}.png" "odalaunch.png" + done + make_desktop_entry odalaunch "Odamex Launcher" odalaunch + fi + fi + + cmake_src_install +} diff --git a/games-engines/odamex/odamex-10.6.0.ebuild b/games-engines/odamex/odamex-10.6.0.ebuild deleted file mode 100644 index 4a70b03acc25..000000000000 --- a/games-engines/odamex/odamex-10.6.0.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# odalaunch crashes with 3.2. Check it before updating! -# https://github.com/odamex/odamex/issues/879 -WX_GTK_VER="3.0-gtk3" -inherit cmake desktop prefix wxwidgets xdg - -DESCRIPTION="Online multiplayer free software engine for DOOM" -HOMEPAGE="https://odamex.net/" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${PN}-src-${PV}.tar.xz" -S="${WORKDIR}/${PN}-src-${PV}" -LICENSE="GPL-2+ MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="+client hidpi master +odalaunch portmidi server upnp" -REQUIRED_USE="|| ( client master server )" - -# protobuf is still bundled. Unfortunately an old version is required for C++98 -# compatibility. We could use C++11, but upstream is concerned about using a -# completely different protobuf version on a multiplayer-focused engine. - -RDEPEND=" - client? ( - media-libs/libpng:0= - media-libs/libsdl2[joystick,sound,video] - media-libs/sdl2-mixer - net-misc/curl - x11-libs/libX11 - !hidpi? ( x11-libs/fltk:1 ) - portmidi? ( media-libs/portmidi ) - ) - odalaunch? ( x11-libs/wxGTK:${WX_GTK_VER} ) - server? ( - dev-libs/jsoncpp:= - upnp? ( net-libs/miniupnpc:= ) - )" -DEPEND="${RDEPEND}" -BDEPEND="games-util/deutex" - -PATCHES=( - "${FILESDIR}"/${PN}-10.3.0-unbundle-fltk.patch -) - -src_prepare() { - rm -r libraries/miniupnp || die - hprefixify common/d_main.cpp - - use odalaunch && setup-wxwidgets - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DUSE_INTERNAL_FLTK=$(usex hidpi) - -DUSE_INTERNAL_JSONCPP=0 - -DUSE_INTERNAL_LIBS=0 - -DUSE_INTERNAL_MINIUPNP=0 - -DBUILD_CLIENT=$(usex client) - -DBUILD_LAUNCHER=$(usex odalaunch) - -DBUILD_MASTER=$(usex master) - -DBUILD_SERVER=$(usex server) - -DBUILD_OR_FAIL=1 - -DENABLE_PORTMIDI=$(usex portmidi) - -DUSE_MINIUPNP=$(usex upnp) - ) - - cmake_src_configure -} - -src_install() { - if use client ; then - for size in 96 128 256 512; do - newicon -s ${size} "${S}/media/icon_${PN}_${size}.png" "${PN}.png" - done - make_desktop_entry "${PN}" "Odamex" - - if use odalaunch ; then - for size in 96 128 256 512; do - newicon -s ${size} "${S}/media/icon_odalaunch_${size}.png" "odalaunch.png" - done - make_desktop_entry odalaunch "Odamex Launcher" odalaunch - fi - fi - - cmake_src_install -} -- cgit v1.2.3-65-gdbad From e0e7b309ee43afca7cd759f5a70860ac5b0a1761 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens <ionen@gentoo.org> Date: Thu, 26 Dec 2024 01:53:37 -0500 Subject: games-simulation/crashtest: add binding := to fltk, soname changed Signed-off-by: Ionen Wolkens <ionen@gentoo.org> --- games-simulation/crashtest/crashtest-1.1-r2.ebuild | 44 ---------------------- games-simulation/crashtest/crashtest-1.1-r3.ebuild | 44 ++++++++++++++++++++++ 2 files changed, 44 insertions(+), 44 deletions(-) delete mode 100644 games-simulation/crashtest/crashtest-1.1-r2.ebuild create mode 100644 games-simulation/crashtest/crashtest-1.1-r3.ebuild diff --git a/games-simulation/crashtest/crashtest-1.1-r2.ebuild b/games-simulation/crashtest/crashtest-1.1-r2.ebuild deleted file mode 100644 index 4f9ff6d8d1b2..000000000000 --- a/games-simulation/crashtest/crashtest-1.1-r2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit desktop toolchain-funcs - -DESCRIPTION="Educational car crash simulator" -HOMEPAGE="https://www.stolk.org/crashtest/" -SRC_URI="https://www.stolk.org/crashtest/${P}.tar.gz" -S="${WORKDIR}/${P}/src-${PN}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - dev-games/ode:= - media-libs/freeglut - media-libs/plib - virtual/glu - virtual/opengl - x11-libs/fltk:1[opengl]" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-gentoo.patch -) - -src_prepare() { - default - - sed -e "s|@GENTOO_DATADIR@|${EPREFIX}/usr/share/${PN}|" \ - -e "s|@GENTOO_BINDIR@|${EPREFIX}/usr/bin|" \ - -i Makefile ${PN}.cxx || die - - tc-export CXX -} - -src_install() { - default - - make_desktop_entry ${PN} Crashtest applications-games -} diff --git a/games-simulation/crashtest/crashtest-1.1-r3.ebuild b/games-simulation/crashtest/crashtest-1.1-r3.ebuild new file mode 100644 index 000000000000..9157646d6f34 --- /dev/null +++ b/games-simulation/crashtest/crashtest-1.1-r3.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop toolchain-funcs + +DESCRIPTION="Educational car crash simulator" +HOMEPAGE="https://www.stolk.org/crashtest/" +SRC_URI="https://www.stolk.org/crashtest/${P}.tar.gz" +S="${WORKDIR}/${P}/src-${PN}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-games/ode:= + media-libs/freeglut + media-libs/plib + virtual/glu + virtual/opengl + x11-libs/fltk:1=[opengl]" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch +) + +src_prepare() { + default + + sed -e "s|@GENTOO_DATADIR@|${EPREFIX}/usr/share/${PN}|" \ + -e "s|@GENTOO_BINDIR@|${EPREFIX}/usr/bin|" \ + -i Makefile ${PN}.cxx || die + + tc-export CXX +} + +src_install() { + default + + make_desktop_entry ${PN} Crashtest applications-games +} -- cgit v1.2.3-65-gdbad From 059593f00ccb54296c8755e60f3ee3707374eeab Mon Sep 17 00:00:00 2001 From: Ionen Wolkens <ionen@gentoo.org> Date: Wed, 25 Dec 2024 10:00:28 -0500 Subject: games-strategy/ja2-stracciatella: remove unused fltk dep Was going around fltk revdeps adding binding := (soname changed) only to find that this does not use fltk with -DBUILD_LAUNCHER=OFF. Doesn't link with it when it's installed, and builds fine when it's not. fwiw left the LOCAL_FLTK_LIB=OFF alone to ensure it doesn't fallback to bundled, not that this code path is reached. Signed-off-by: Ionen Wolkens <ionen@gentoo.org> --- .../ja2-stracciatella-0.21.0-r1.ebuild | 278 --------------------- .../ja2-stracciatella-0.21.0-r2.ebuild | 277 ++++++++++++++++++++ 2 files changed, 277 insertions(+), 278 deletions(-) delete mode 100644 games-strategy/ja2-stracciatella/ja2-stracciatella-0.21.0-r1.ebuild create mode 100644 games-strategy/ja2-stracciatella/ja2-stracciatella-0.21.0-r2.ebuild diff --git a/games-strategy/ja2-stracciatella/ja2-stracciatella-0.21.0-r1.ebuild b/games-strategy/ja2-stracciatella/ja2-stracciatella-0.21.0-r1.ebuild deleted file mode 100644 index f296653e14c9..000000000000 --- a/games-strategy/ja2-stracciatella/ja2-stracciatella-0.21.0-r1.ebuild +++ /dev/null @@ -1,278 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CRATES=" - addr2line@0.17.0 - adler@1.0.2 - ahash@0.7.6 - aho-corasick@0.7.18 - ansi_term@0.11.0 - anyhow@1.0.69 - ascii@0.9.3 - atty@0.2.14 - autocfg@1.1.0 - backtrace@0.3.65 - base64@0.13.1 - bit-set@0.5.3 - bit-vec@0.6.3 - bitflags@1.3.2 - block-buffer@0.10.3 - bytecount@0.6.3 - byteorder@1.4.3 - bytes@1.4.0 - caseless@0.2.1 - cbindgen@0.20.0 - cc@1.0.73 - cesu8@1.1.0 - cfg-if@1.0.0 - clap@2.33.4 - combine@3.8.1 - combine@4.6.4 - crossbeam-channel@0.5.4 - crossbeam-deque@0.8.1 - crossbeam-epoch@0.9.8 - crossbeam-utils@0.8.8 - crypto-common@0.1.6 - cty@0.2.2 - deunicode@0.4.3 - digest@0.10.6 - dirs@4.0.0 - dirs-sys@0.3.7 - dunce@1.0.2 - either@1.6.1 - error-chain@0.12.4 - fancy-regex@0.8.0 - fastrand@1.7.0 - form_urlencoded@1.1.0 - fraction@0.10.0 - generic-array@0.14.5 - getopts@0.2.21 - getrandom@0.2.6 - gimli@0.26.1 - hashbrown@0.12.3 - heck@0.3.3 - hermit-abi@0.1.19 - hex@0.4.3 - idna@0.3.0 - indexmap@1.9.2 - instant@0.1.12 - iso8601@0.4.2 - itoa@1.0.1 - jni@0.14.0 - jni@0.19.0 - jni-sys@0.3.0 - json_comments@0.2.1 - jsonschema@0.16.0 - lazy_static@1.4.0 - libc@0.2.124 - lock_api@0.4.9 - log@0.4.16 - lru@0.8.1 - md-5@0.10.5 - memchr@2.4.1 - memoffset@0.6.5 - minimal-lexical@0.2.1 - miniz_oxide@0.5.1 - ndk@0.7.0 - ndk-sys@0.4.1+23.1.7779620 - nom@7.1.3 - num@0.2.1 - num-bigint@0.2.6 - num-cmp@0.1.0 - num-complex@0.2.4 - num-integer@0.1.45 - num-iter@0.1.43 - num-rational@0.2.4 - num-traits@0.2.15 - num_cpus@1.13.1 - num_enum@0.5.7 - num_enum_derive@0.5.7 - num_threads@0.1.6 - object@0.28.3 - once_cell@1.10.0 - parking_lot@0.12.1 - parking_lot_core@0.9.7 - percent-encoding@2.2.0 - proc-macro-crate@1.1.3 - proc-macro2@1.0.51 - quote@1.0.18 - raw-window-handle@0.5.0 - rayon@1.6.1 - rayon-core@1.10.2 - redox_syscall@0.2.13 - redox_users@0.4.3 - regex@1.7.1 - regex-syntax@0.6.28 - remove_dir_all@0.5.3 - rustc-demangle@0.1.21 - ryu@1.0.9 - same-file@1.0.6 - scopeguard@1.1.0 - send_wrapper@0.6.0 - serde@1.0.152 - serde_derive@1.0.152 - serde_json@1.0.93 - serde_yaml@0.9.17 - simplelog@0.12.0 - slug@0.1.4 - smallvec@1.10.0 - strsim@0.8.0 - syn@1.0.107 - tempfile@3.3.0 - termcolor@1.1.3 - textwrap@0.11.0 - thiserror@1.0.30 - thiserror-impl@1.0.30 - time@0.3.15 - time-macros@0.2.4 - tinyvec@1.6.0 - tinyvec_macros@0.1.1 - toml@0.5.9 - typenum@1.15.0 - unicode-bidi@0.3.10 - unicode-ident@1.0.6 - unicode-normalization@0.1.19 - unicode-segmentation@1.10.1 - unicode-width@0.1.9 - unreachable@1.0.0 - unsafe-libyaml@0.2.5 - url@2.3.1 - uuid@0.8.2 - vec_map@0.8.2 - version_check@0.9.4 - void@1.0.2 - walkdir@2.3.2 - wasi@0.10.2+wasi-snapshot-preview1 - winapi@0.3.9 - winapi-i686-pc-windows-gnu@0.4.0 - winapi-util@0.1.5 - winapi-x86_64-pc-windows-gnu@0.4.0 - windows-sys@0.45.0 - windows-targets@0.42.1 - windows_aarch64_gnullvm@0.42.1 - windows_aarch64_msvc@0.42.1 - windows_i686_gnu@0.42.1 - windows_i686_msvc@0.42.1 - windows_x86_64_gnu@0.42.1 - windows_x86_64_gnullvm@0.42.1 - windows_x86_64_msvc@0.42.1 -" - -# See dependencies/lib-lua/CMakeLists.txt -LUA_COMPAT=( lua5-3 ) - -# proc_macro-span_shrink; update proc-macro2 crate -RUST_MAX_VER="1.71.1" - -inherit cargo cmake flag-o-matic lua-single xdg - -DESCRIPTION="An improved, cross-platform, stable Jagged Alliance 2 runtime" -HOMEPAGE="https://github.com/ja2-stracciatella/" -SRC_URI=" - https://github.com/ja2-stracciatella/ja2-stracciatella/archive/v${PV}.tar.gz -> ${P}.tar.gz - editor? ( https://github.com/ja2-stracciatella/free-ja2-resources/releases/download/v1/editor.slf -> ${P}-editor.slf ) -" -SRC_URI+=" $(cargo_crate_uris ${CARGO_CRATES_URIS})" - -LICENSE="public-domain SFI-SCLA" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" -IUSE="cdinstall editor ru-gold test" -# ./ja2 -unittest can't find save files -RESTRICT="!test? ( test ) test" -REQUIRED_USE="${LUA_REQUIRED_USE}" - -DEPEND=" - ${LUA_DEPS} - >=dev-cpp/magic_enum-0.9.5 - >=dev-cpp/sol2-3.3.0 - >=dev-cpp/string-theory-3.1 - >=dev-games/libsmacker-1.1.1 - >=dev-libs/miniaudio-0.11.11 - >=dev-libs/rapidjson-1.1.0 - media-libs/libsdl2[X,sound,video] - >=x11-libs/fltk-1.3.5[opengl] -" -RDEPEND=" - ${DEPEND} - cdinstall? ( games-strategy/ja2-stracciatella-data ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.20.0-lua-cmake.patch -) - -pkg_setup() { - lua-single_pkg_setup - rust_pkg_setup -} - -src_prepare() { - cmake_src_prepare -} - -src_configure() { - # -Werror=odr - # https://bugs.gentoo.org/916965 - # https://github.com/ja2-stracciatella/ja2-stracciatella/issues/1963 - filter-lto - - local mycmakeargs=( - -DUSE_SCCACHE=OFF - - -DLOCAL_GTEST_LIB=OFF - -DLOCAL_FLTK_LIB=OFF - - -DLOCAL_LUA_LIB=OFF - -DLUA_VERSION="${ELUA#lua}" - - -DLOCAL_MAGICENUM_LIB=OFF - -DLOCAL_MINIAUDIO_LIB=OFF - -DLOCAL_RAPIDJSON_LIB=OFF - -DLOCAL_SDL_LIB=OFF - -DLOCAL_SOL_LIB=OFF - -DLOCAL_STRING_THEORY_LIB=OFF - - -DWITH_MAGICENUM=OFF - -DWITH_RUST_BINARIES=OFF - -DWITH_UNITTESTS=$(usex test) - - -DBUILD_LAUNCHER=OFF - - -DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" - -DEXTRA_DATA_DIR="${EPREFIX}/usr/share/ja2" - -DMINIAUDIO_INCLUDE_DIR="${EPREFIX}/usr/include/miniaudio" - -DMAGICENUM_INCLUDE_DIR="${EPREFIX}/usr/include" - ) - - cargo_gen_config - cmake_src_configure -} - -src_install() { - if use editor; then - insinto /usr/share/ja2 - doins "${DISTDIR}/${P}-editor.slf" - dosym "${P}-editor.slf" "/usr/share/ja2/editor.slf" - fi - - cmake_src_install -} - -src_test() { - "${BUILD_DIR}"/ja2 -unittests || die -} - -pkg_postinst() { - if ! use cdinstall ; then - elog "You need to copy all files from the Data directory of" - elog "Jagged Alliance 2 installation to" - elog "e.g. /opt/ja2/data and set game_dir in .ja2/ja2.json" - elog "accordingly." - elog "Make sure the filenames are lowercase." - fi - - xdg_pkg_postinst -} diff --git a/games-strategy/ja2-stracciatella/ja2-stracciatella-0.21.0-r2.ebuild b/games-strategy/ja2-stracciatella/ja2-stracciatella-0.21.0-r2.ebuild new file mode 100644 index 000000000000..28db1e673105 --- /dev/null +++ b/games-strategy/ja2-stracciatella/ja2-stracciatella-0.21.0-r2.ebuild @@ -0,0 +1,277 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES=" + addr2line@0.17.0 + adler@1.0.2 + ahash@0.7.6 + aho-corasick@0.7.18 + ansi_term@0.11.0 + anyhow@1.0.69 + ascii@0.9.3 + atty@0.2.14 + autocfg@1.1.0 + backtrace@0.3.65 + base64@0.13.1 + bit-set@0.5.3 + bit-vec@0.6.3 + bitflags@1.3.2 + block-buffer@0.10.3 + bytecount@0.6.3 + byteorder@1.4.3 + bytes@1.4.0 + caseless@0.2.1 + cbindgen@0.20.0 + cc@1.0.73 + cesu8@1.1.0 + cfg-if@1.0.0 + clap@2.33.4 + combine@3.8.1 + combine@4.6.4 + crossbeam-channel@0.5.4 + crossbeam-deque@0.8.1 + crossbeam-epoch@0.9.8 + crossbeam-utils@0.8.8 + crypto-common@0.1.6 + cty@0.2.2 + deunicode@0.4.3 + digest@0.10.6 + dirs@4.0.0 + dirs-sys@0.3.7 + dunce@1.0.2 + either@1.6.1 + error-chain@0.12.4 + fancy-regex@0.8.0 + fastrand@1.7.0 + form_urlencoded@1.1.0 + fraction@0.10.0 + generic-array@0.14.5 + getopts@0.2.21 + getrandom@0.2.6 + gimli@0.26.1 + hashbrown@0.12.3 + heck@0.3.3 + hermit-abi@0.1.19 + hex@0.4.3 + idna@0.3.0 + indexmap@1.9.2 + instant@0.1.12 + iso8601@0.4.2 + itoa@1.0.1 + jni@0.14.0 + jni@0.19.0 + jni-sys@0.3.0 + json_comments@0.2.1 + jsonschema@0.16.0 + lazy_static@1.4.0 + libc@0.2.124 + lock_api@0.4.9 + log@0.4.16 + lru@0.8.1 + md-5@0.10.5 + memchr@2.4.1 + memoffset@0.6.5 + minimal-lexical@0.2.1 + miniz_oxide@0.5.1 + ndk@0.7.0 + ndk-sys@0.4.1+23.1.7779620 + nom@7.1.3 + num@0.2.1 + num-bigint@0.2.6 + num-cmp@0.1.0 + num-complex@0.2.4 + num-integer@0.1.45 + num-iter@0.1.43 + num-rational@0.2.4 + num-traits@0.2.15 + num_cpus@1.13.1 + num_enum@0.5.7 + num_enum_derive@0.5.7 + num_threads@0.1.6 + object@0.28.3 + once_cell@1.10.0 + parking_lot@0.12.1 + parking_lot_core@0.9.7 + percent-encoding@2.2.0 + proc-macro-crate@1.1.3 + proc-macro2@1.0.51 + quote@1.0.18 + raw-window-handle@0.5.0 + rayon@1.6.1 + rayon-core@1.10.2 + redox_syscall@0.2.13 + redox_users@0.4.3 + regex@1.7.1 + regex-syntax@0.6.28 + remove_dir_all@0.5.3 + rustc-demangle@0.1.21 + ryu@1.0.9 + same-file@1.0.6 + scopeguard@1.1.0 + send_wrapper@0.6.0 + serde@1.0.152 + serde_derive@1.0.152 + serde_json@1.0.93 + serde_yaml@0.9.17 + simplelog@0.12.0 + slug@0.1.4 + smallvec@1.10.0 + strsim@0.8.0 + syn@1.0.107 + tempfile@3.3.0 + termcolor@1.1.3 + textwrap@0.11.0 + thiserror@1.0.30 + thiserror-impl@1.0.30 + time@0.3.15 + time-macros@0.2.4 + tinyvec@1.6.0 + tinyvec_macros@0.1.1 + toml@0.5.9 + typenum@1.15.0 + unicode-bidi@0.3.10 + unicode-ident@1.0.6 + unicode-normalization@0.1.19 + unicode-segmentation@1.10.1 + unicode-width@0.1.9 + unreachable@1.0.0 + unsafe-libyaml@0.2.5 + url@2.3.1 + uuid@0.8.2 + vec_map@0.8.2 + version_check@0.9.4 + void@1.0.2 + walkdir@2.3.2 + wasi@0.10.2+wasi-snapshot-preview1 + winapi@0.3.9 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-util@0.1.5 + winapi-x86_64-pc-windows-gnu@0.4.0 + windows-sys@0.45.0 + windows-targets@0.42.1 + windows_aarch64_gnullvm@0.42.1 + windows_aarch64_msvc@0.42.1 + windows_i686_gnu@0.42.1 + windows_i686_msvc@0.42.1 + windows_x86_64_gnu@0.42.1 + windows_x86_64_gnullvm@0.42.1 + windows_x86_64_msvc@0.42.1 +" + +# See dependencies/lib-lua/CMakeLists.txt +LUA_COMPAT=( lua5-3 ) + +# proc_macro-span_shrink; update proc-macro2 crate +RUST_MAX_VER="1.71.1" + +inherit cargo cmake flag-o-matic lua-single xdg + +DESCRIPTION="An improved, cross-platform, stable Jagged Alliance 2 runtime" +HOMEPAGE="https://github.com/ja2-stracciatella/" +SRC_URI=" + https://github.com/ja2-stracciatella/ja2-stracciatella/archive/v${PV}.tar.gz -> ${P}.tar.gz + editor? ( https://github.com/ja2-stracciatella/free-ja2-resources/releases/download/v1/editor.slf -> ${P}-editor.slf ) +" +SRC_URI+=" $(cargo_crate_uris ${CARGO_CRATES_URIS})" + +LICENSE="public-domain SFI-SCLA" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE="cdinstall editor ru-gold test" +# ./ja2 -unittest can't find save files +RESTRICT="!test? ( test ) test" +REQUIRED_USE="${LUA_REQUIRED_USE}" + +DEPEND=" + ${LUA_DEPS} + >=dev-cpp/magic_enum-0.9.5 + >=dev-cpp/sol2-3.3.0 + >=dev-cpp/string-theory-3.1 + >=dev-games/libsmacker-1.1.1 + >=dev-libs/miniaudio-0.11.11 + >=dev-libs/rapidjson-1.1.0 + media-libs/libsdl2[X,sound,video] +" +RDEPEND=" + ${DEPEND} + cdinstall? ( games-strategy/ja2-stracciatella-data ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-0.20.0-lua-cmake.patch +) + +pkg_setup() { + lua-single_pkg_setup + rust_pkg_setup +} + +src_prepare() { + cmake_src_prepare +} + +src_configure() { + # -Werror=odr + # https://bugs.gentoo.org/916965 + # https://github.com/ja2-stracciatella/ja2-stracciatella/issues/1963 + filter-lto + + local mycmakeargs=( + -DUSE_SCCACHE=OFF + + -DLOCAL_GTEST_LIB=OFF + -DLOCAL_FLTK_LIB=OFF + + -DLOCAL_LUA_LIB=OFF + -DLUA_VERSION="${ELUA#lua}" + + -DLOCAL_MAGICENUM_LIB=OFF + -DLOCAL_MINIAUDIO_LIB=OFF + -DLOCAL_RAPIDJSON_LIB=OFF + -DLOCAL_SDL_LIB=OFF + -DLOCAL_SOL_LIB=OFF + -DLOCAL_STRING_THEORY_LIB=OFF + + -DWITH_MAGICENUM=OFF + -DWITH_RUST_BINARIES=OFF + -DWITH_UNITTESTS=$(usex test) + + -DBUILD_LAUNCHER=OFF + + -DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" + -DEXTRA_DATA_DIR="${EPREFIX}/usr/share/ja2" + -DMINIAUDIO_INCLUDE_DIR="${EPREFIX}/usr/include/miniaudio" + -DMAGICENUM_INCLUDE_DIR="${EPREFIX}/usr/include" + ) + + cargo_gen_config + cmake_src_configure +} + +src_install() { + if use editor; then + insinto /usr/share/ja2 + doins "${DISTDIR}/${P}-editor.slf" + dosym "${P}-editor.slf" "/usr/share/ja2/editor.slf" + fi + + cmake_src_install +} + +src_test() { + "${BUILD_DIR}"/ja2 -unittests || die +} + +pkg_postinst() { + if ! use cdinstall ; then + elog "You need to copy all files from the Data directory of" + elog "Jagged Alliance 2 installation to" + elog "e.g. /opt/ja2/data and set game_dir in .ja2/ja2.json" + elog "accordingly." + elog "Make sure the filenames are lowercase." + fi + + xdg_pkg_postinst +} -- cgit v1.2.3-65-gdbad From 40db9f3a2b53f3d788fc8d376ce7a93561cee9b6 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens <ionen@gentoo.org> Date: Thu, 26 Dec 2024 01:54:03 -0500 Subject: games-util/eureka: add binding := to fltk, soname changed Signed-off-by: Ionen Wolkens <ionen@gentoo.org> --- games-util/eureka/eureka-1.27b-r1.ebuild | 54 ++++++++++++++++++++++++++++++++ games-util/eureka/eureka-1.27b.ebuild | 54 -------------------------------- 2 files changed, 54 insertions(+), 54 deletions(-) create mode 100644 games-util/eureka/eureka-1.27b-r1.ebuild delete mode 100644 games-util/eureka/eureka-1.27b.ebuild diff --git a/games-util/eureka/eureka-1.27b-r1.ebuild b/games-util/eureka/eureka-1.27b-r1.ebuild new file mode 100644 index 000000000000..5abf2cbbf180 --- /dev/null +++ b/games-util/eureka/eureka-1.27b-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop toolchain-funcs xdg + +DESCRIPTION="Graphical map editor for games using the DOOM engine" +HOMEPAGE="https://eureka-editor.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/${PN}-editor/Eureka/${PV%[a-z]}/${P}-source.tar.gz" +S="${WORKDIR}/${P}-source" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+opengl" + +DEPEND=" + sys-libs/zlib + x11-libs/fltk:1=[opengl?] + opengl? ( + media-libs/glu + virtual/opengl + ) +" + +RDEPEND=" + ${DEPEND} +" + +PATCHES=( + "${FILESDIR}"/${PN}-Makefile.patch +) + +DOCS=( + AUTHORS.txt + CHANGES.txt + README.txt + TODO.txt +) + +src_compile() { + emake \ + CXX="$(tc-getCXX)" \ + OPENGL="$(usex opengl 1 0)" +} + +src_install() { + emake install PREFIX="${ED}/usr" + einstalldocs + + doicon -s 32 misc/${PN}.xpm + domenu misc/${PN}.desktop +} diff --git a/games-util/eureka/eureka-1.27b.ebuild b/games-util/eureka/eureka-1.27b.ebuild deleted file mode 100644 index ef94dc07a656..000000000000 --- a/games-util/eureka/eureka-1.27b.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop toolchain-funcs xdg - -DESCRIPTION="Graphical map editor for games using the DOOM engine" -HOMEPAGE="https://eureka-editor.sourceforge.net/" -SRC_URI="https://downloads.sourceforge.net/${PN}-editor/Eureka/${PV%[a-z]}/${P}-source.tar.gz" -S="${WORKDIR}/${P}-source" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+opengl" - -DEPEND=" - sys-libs/zlib - x11-libs/fltk:1[opengl?] - opengl? ( - media-libs/glu - virtual/opengl - ) -" - -RDEPEND=" - ${DEPEND} -" - -PATCHES=( - "${FILESDIR}"/${PN}-Makefile.patch -) - -DOCS=( - AUTHORS.txt - CHANGES.txt - README.txt - TODO.txt -) - -src_compile() { - emake \ - CXX="$(tc-getCXX)" \ - OPENGL="$(usex opengl 1 0)" -} - -src_install() { - emake install PREFIX="${ED}/usr" - einstalldocs - - doicon -s 32 misc/${PN}.xpm - domenu misc/${PN}.desktop -} -- cgit v1.2.3-65-gdbad From 1fde39b7320babf0f6fa1fff4eeb61e33f4791d6 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens <ionen@gentoo.org> Date: Thu, 26 Dec 2024 02:11:50 -0500 Subject: games-util/glbsp: add binding := to fltk, soname changed Signed-off-by: Ionen Wolkens <ionen@gentoo.org> --- games-util/glbsp/glbsp-2.24-r1.ebuild | 70 +++++++++++++++++++++++++++++++++++ games-util/glbsp/glbsp-2.24.ebuild | 70 ----------------------------------- 2 files changed, 70 insertions(+), 70 deletions(-) create mode 100644 games-util/glbsp/glbsp-2.24-r1.ebuild delete mode 100644 games-util/glbsp/glbsp-2.24.ebuild diff --git a/games-util/glbsp/glbsp-2.24-r1.ebuild b/games-util/glbsp/glbsp-2.24-r1.ebuild new file mode 100644 index 000000000000..f2accf2462e3 --- /dev/null +++ b/games-util/glbsp/glbsp-2.24-r1.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop toolchain-funcs + +MY_PV=$(ver_rs 1 '') +DESCRIPTION="Node builder specially designed for OpenGL ports of the DOOM game engine" +HOMEPAGE="https://glbsp.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/glbsp/${PN}_src_${MY_PV}.tar.gz" +S="${WORKDIR}"/${P}-source + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="fltk" + +DEPEND="fltk? ( x11-libs/fltk:1= )" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-ldflags.patch + "${FILESDIR}"/${P}-return-type.patch +) + +src_prepare() { + default + + sed -i \ + -e "/^CC=/s:=.*:=$(tc-getCC):" \ + -e "/^CXX=/s:=.*:=$(tc-getCXX):" \ + -e "/^AR=/s:ar:$(tc-getAR):" \ + -e "/^RANLIB=/s:=.*:=$(tc-getRANLIB):" \ + -e "s:-O2:${CFLAGS}:" \ + -e "s:-O -g3:${CFLAGS}:" \ + Makefile.unx \ + nodeview/Makefile.unx || die +} + +src_compile() { + emake -f Makefile.unx + if use fltk ; then + emake -f Makefile.unx glBSPX \ + FLTK_FLAGS="$(fltk-config --cflags)" \ + FLTK_LIBS="$(fltk-config --use-images --ldflags)" + emake -f Makefile.unx -C nodeview \ + FLTK_CFLAGS="$(fltk-config --cflags)" \ + FLTK_LIBS="$(fltk-config --use-images --ldflags)" + fi +} + +src_install() { + dobin glbsp + dolib.a libglbsp.a + doman glbsp.1 + dodoc AUTHORS.txt glbsp.txt + insinto "/usr/include" + doins "src/glbsp.h" + + if use fltk ; then + newbin glBSPX glbspx + newicon gui/icon.xpm glbspx.xpm + make_desktop_entry glbspx glBSPX glbspx + + dobin nodeview/nodeview + docinto nodeview + dodoc nodeview/{README,TODO}.txt + fi +} diff --git a/games-util/glbsp/glbsp-2.24.ebuild b/games-util/glbsp/glbsp-2.24.ebuild deleted file mode 100644 index d1dfbf4aca7b..000000000000 --- a/games-util/glbsp/glbsp-2.24.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop toolchain-funcs - -MY_PV=$(ver_rs 1 '') -DESCRIPTION="Node builder specially designed for OpenGL ports of the DOOM game engine" -HOMEPAGE="https://glbsp.sourceforge.net/" -SRC_URI="https://downloads.sourceforge.net/glbsp/${PN}_src_${MY_PV}.tar.gz" -S="${WORKDIR}"/${P}-source - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="fltk" - -DEPEND="fltk? ( x11-libs/fltk:1 )" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-ldflags.patch - "${FILESDIR}"/${P}-return-type.patch -) - -src_prepare() { - default - - sed -i \ - -e "/^CC=/s:=.*:=$(tc-getCC):" \ - -e "/^CXX=/s:=.*:=$(tc-getCXX):" \ - -e "/^AR=/s:ar:$(tc-getAR):" \ - -e "/^RANLIB=/s:=.*:=$(tc-getRANLIB):" \ - -e "s:-O2:${CFLAGS}:" \ - -e "s:-O -g3:${CFLAGS}:" \ - Makefile.unx \ - nodeview/Makefile.unx || die -} - -src_compile() { - emake -f Makefile.unx - if use fltk ; then - emake -f Makefile.unx glBSPX \ - FLTK_FLAGS="$(fltk-config --cflags)" \ - FLTK_LIBS="$(fltk-config --use-images --ldflags)" - emake -f Makefile.unx -C nodeview \ - FLTK_CFLAGS="$(fltk-config --cflags)" \ - FLTK_LIBS="$(fltk-config --use-images --ldflags)" - fi -} - -src_install() { - dobin glbsp - dolib.a libglbsp.a - doman glbsp.1 - dodoc AUTHORS.txt glbsp.txt - insinto "/usr/include" - doins "src/glbsp.h" - - if use fltk ; then - newbin glBSPX glbspx - newicon gui/icon.xpm glbspx.xpm - make_desktop_entry glbspx glBSPX glbspx - - dobin nodeview/nodeview - docinto nodeview - dodoc nodeview/{README,TODO}.txt - fi -} -- cgit v1.2.3-65-gdbad From 7be662ca395b74467c83eab0b4908a90850b592f Mon Sep 17 00:00:00 2001 From: Ionen Wolkens <ionen@gentoo.org> Date: Thu, 26 Dec 2024 02:12:05 -0500 Subject: media-gfx/monica: add binding := to fltk, soname changed Also cleanup lower bound, 1.1 is extremely ancient. Signed-off-by: Ionen Wolkens <ionen@gentoo.org> --- media-gfx/monica/monica-3.7-r1.ebuild | 39 ----------------------------------- media-gfx/monica/monica-3.7-r2.ebuild | 39 +++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 39 deletions(-) delete mode 100644 media-gfx/monica/monica-3.7-r1.ebuild create mode 100644 media-gfx/monica/monica-3.7-r2.ebuild diff --git a/media-gfx/monica/monica-3.7-r1.ebuild b/media-gfx/monica/monica-3.7-r1.ebuild deleted file mode 100644 index b6be41461371..000000000000 --- a/media-gfx/monica/monica-3.7-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="Monica is a Monitor Calibration Tool" -HOMEPAGE="https://web.archive.org/web/20201111203551/http://freshmeat.sourceforge.net/projects/monica https://web.archive.org/web/20051016203856/http://www.pcbypaul.com:80/linux/monica.html" -SRC_URI="mirror://gentoo/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ppc x86" - -DEPEND=">=x11-libs/fltk-1.1:1" -RDEPEND="${DEPEND} - x11-apps/xgamma" - -DOCS=( authors ChangeLog news readme ) -PATCHES=( - "${FILESDIR}"/${PN}-3.7-makefile-cleanup.patch - "${FILESDIR}"/${P}-gcc44.patch - "${FILESDIR}"/${P}-fprintf.patch - "${FILESDIR}"/${P}-exit.patch -) - -src_compile() { - emake \ - CXX="$(tc-getCXX)" \ - CXXFLAGS="${CXXFLAGS}" \ - LINK="$(tc-getCXX)" \ - LDFLAGS="${LDFLAGS}" -} - -src_install() { - dobin monica - einstalldocs -} diff --git a/media-gfx/monica/monica-3.7-r2.ebuild b/media-gfx/monica/monica-3.7-r2.ebuild new file mode 100644 index 000000000000..e93b87dfeff1 --- /dev/null +++ b/media-gfx/monica/monica-3.7-r2.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Monica is a Monitor Calibration Tool" +HOMEPAGE="https://web.archive.org/web/20201111203551/http://freshmeat.sourceforge.net/projects/monica https://web.archive.org/web/20051016203856/http://www.pcbypaul.com:80/linux/monica.html" +SRC_URI="mirror://gentoo/${P}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ppc x86" + +DEPEND="x11-libs/fltk:1=" +RDEPEND="${DEPEND} + x11-apps/xgamma" + +DOCS=( authors ChangeLog news readme ) +PATCHES=( + "${FILESDIR}"/${PN}-3.7-makefile-cleanup.patch + "${FILESDIR}"/${P}-gcc44.patch + "${FILESDIR}"/${P}-fprintf.patch + "${FILESDIR}"/${P}-exit.patch +) + +src_compile() { + emake \ + CXX="$(tc-getCXX)" \ + CXXFLAGS="${CXXFLAGS}" \ + LINK="$(tc-getCXX)" \ + LDFLAGS="${LDFLAGS}" +} + +src_install() { + dobin monica + einstalldocs +} -- cgit v1.2.3-65-gdbad From 16e7f56d6ad6094d19c4ad09dee52a3b5b448977 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens <ionen@gentoo.org> Date: Thu, 26 Dec 2024 02:13:09 -0500 Subject: media-gfx/quat: add binding := to fltk & fix build with 1.4 1.4.x drops the case sensitivity compat symlinks by default and upstream strongly recommends to fix packages rather than re-enable them. := due to new soname Signed-off-by: Ionen Wolkens <ionen@gentoo.org> --- media-gfx/quat/files/quat-1.20-fltk1.4.patch | 6 ++++ media-gfx/quat/quat-1.20-r3.ebuild | 43 -------------------------- media-gfx/quat/quat-1.20-r4.ebuild | 46 ++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 43 deletions(-) create mode 100644 media-gfx/quat/files/quat-1.20-fltk1.4.patch delete mode 100644 media-gfx/quat/quat-1.20-r3.ebuild create mode 100644 media-gfx/quat/quat-1.20-r4.ebuild diff --git a/media-gfx/quat/files/quat-1.20-fltk1.4.patch b/media-gfx/quat/files/quat-1.20-fltk1.4.patch new file mode 100644 index 000000000000..d3426b2db0b0 --- /dev/null +++ b/media-gfx/quat/files/quat-1.20-fltk1.4.patch @@ -0,0 +1,6 @@ +Deprecated compatibility symlinks are removed. +--- a/gui/MainWindow.cxx ++++ b/gui/MainWindow.cxx +@@ -56 +56 @@ +-#include <FL/fl_file_chooser.H> ++#include <FL/Fl_File_Chooser.H> diff --git a/media-gfx/quat/quat-1.20-r3.ebuild b/media-gfx/quat/quat-1.20-r3.ebuild deleted file mode 100644 index f237c96e4554..000000000000 --- a/media-gfx/quat/quat-1.20-r3.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic - -DESCRIPTION="A 3D quaternionic fractal generator" -HOMEPAGE="http://www.physcip.uni-stuttgart.de/phy11733/quat_e.html" -SRC_URI="http://www.physcip.uni-stuttgart.de/phy11733/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="X debug" - -DEPEND=" - >=sys-libs/zlib-1.1.4 - X? ( - =x11-libs/fltk-1* - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXft - ) -" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${P}-fix-build-for-clang16.patch" ) - -src_configure() { - # throws tons of warnings otherwise - append-cxxflags -Wno-deprecated-declarations -Wno-writable-strings - export FLUID="/usr/bin/fluid" # needed because configure tries an invalid option - econf \ - $(use_enable X gui) \ - $(use_enable debug) \ - $(use_enable debug prof) -} - -src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS ChangeLog NEWS README -} diff --git a/media-gfx/quat/quat-1.20-r4.ebuild b/media-gfx/quat/quat-1.20-r4.ebuild new file mode 100644 index 000000000000..da95cfeec35c --- /dev/null +++ b/media-gfx/quat/quat-1.20-r4.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic + +DESCRIPTION="A 3D quaternionic fractal generator" +HOMEPAGE="http://www.physcip.uni-stuttgart.de/phy11733/quat_e.html" +SRC_URI="http://www.physcip.uni-stuttgart.de/phy11733/download/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ppc x86" +IUSE="X debug" + +DEPEND=" + >=sys-libs/zlib-1.1.4 + X? ( + x11-libs/fltk:1= + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXft + ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-fix-build-for-clang16.patch" + "${FILESDIR}/${P}-fltk1.4.patch" +) + +src_configure() { + # throws tons of warnings otherwise + append-cxxflags -Wno-deprecated-declarations -Wno-writable-strings + export FLUID="/usr/bin/fluid" # needed because configure tries an invalid option + econf \ + $(use_enable X gui) \ + $(use_enable debug) \ + $(use_enable debug prof) +} + +src_install() { + emake DESTDIR="${D}" install + dodoc AUTHORS ChangeLog NEWS README +} -- cgit v1.2.3-65-gdbad From 1d1fa036e68e313aa55c3fe30448358b9f1af191 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens <ionen@gentoo.org> Date: Thu, 26 Dec 2024 02:16:19 -0500 Subject: media-radio/fldigi: add binding := to fltk, soname changed Also update [threads/xft] due to the USEs being dropped in fltk-1.4 Signed-off-by: Ionen Wolkens <ionen@gentoo.org> --- media-radio/fldigi/fldigi-4.2.05-r2.ebuild | 64 ------------------------------ media-radio/fldigi/fldigi-4.2.05-r3.ebuild | 62 +++++++++++++++++++++++++++++ media-radio/fldigi/fldigi-4.2.05-r4.ebuild | 64 ++++++++++++++++++++++++++++++ media-radio/fldigi/fldigi-4.2.05.ebuild | 62 ----------------------------- media-radio/fldigi/fldigi-4.2.06-r1.ebuild | 64 ++++++++++++++++++++++++++++++ media-radio/fldigi/fldigi-4.2.06.ebuild | 64 ------------------------------ 6 files changed, 190 insertions(+), 190 deletions(-) delete mode 100644 media-radio/fldigi/fldigi-4.2.05-r2.ebuild create mode 100644 media-radio/fldigi/fldigi-4.2.05-r3.ebuild create mode 100644 media-radio/fldigi/fldigi-4.2.05-r4.ebuild delete mode 100644 media-radio/fldigi/fldigi-4.2.05.ebuild create mode 100644 media-radio/fldigi/fldigi-4.2.06-r1.ebuild delete mode 100644 media-radio/fldigi/fldigi-4.2.06.ebuild diff --git a/media-radio/fldigi/fldigi-4.2.05-r2.ebuild b/media-radio/fldigi/fldigi-4.2.05-r2.ebuild deleted file mode 100644 index 6f0e742ae1a0..000000000000 --- a/media-radio/fldigi/fldigi-4.2.05-r2.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic - -DESCRIPTION="Sound card based multimode software modem for Amateur Radio use" -HOMEPAGE="http://www.w1hkj.com" -SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="hamlib nls pulseaudio" -IUSE_CPU_FLAGS=" sse sse2 sse3" -IUSE+=" ${IUSE_CPU_FLAGS// / cpu_flags_x86_}" - -RDEPEND="x11-libs/fltk:1[threads,xft] - x11-libs/libX11 - virtual/libudev:= - media-libs/libsamplerate - media-libs/libpng:= - x11-misc/xdg-utils - dev-perl/RPC-XML - dev-perl/Term-ReadLine-Perl - || ( - media-libs/portaudio[oss] - media-libs/portaudio[alsa] - ) - hamlib? ( media-libs/hamlib:= ) - pulseaudio? ( media-libs/libpulse ) - media-libs/libsndfile" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext ) - virtual/pkgconfig" - -DOCS=( AUTHORS ChangeLog NEWS README ) - -PATCHES=( "${FILESDIR}/${PN}-drop-nullptr-definition.patch" ) - -src_prepare() { - eapply ${PATCHES[@]} - eapply_user -} - -src_configure() { - #fails to compile with -flto (bug #860405) - filter-lto - - append-cxxflags $(test-flags-CXX -std=c++14) - local myconf="" - - use cpu_flags_x86_sse && myconf="${myconf} --enable-optimizations=sse" - use cpu_flags_x86_sse2 && myconf="${myconf} --enable-optimizations=sse2" - use cpu_flags_x86_sse3 && myconf="${myconf} --enable-optimizations=sse3" - - econf ${myconf} \ - --with-sndfile \ - $(use_with hamlib) \ - $(use_enable nls) \ - $(use_with pulseaudio) \ - --without-asciidoc -} diff --git a/media-radio/fldigi/fldigi-4.2.05-r3.ebuild b/media-radio/fldigi/fldigi-4.2.05-r3.ebuild new file mode 100644 index 000000000000..bb65c55744f8 --- /dev/null +++ b/media-radio/fldigi/fldigi-4.2.05-r3.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic + +DESCRIPTION="Sound card based multimode software modem for Amateur Radio use" +HOMEPAGE="http://www.w1hkj.com" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="hamlib nls pulseaudio" +IUSE_CPU_FLAGS=" sse sse2 sse3" +IUSE+=" ${IUSE_CPU_FLAGS// / cpu_flags_x86_}" + +RDEPEND="x11-libs/fltk:1=[threads(+),xft(+)] + media-libs/libsamplerate + media-libs/libpng:0 + x11-misc/xdg-utils + dev-perl/RPC-XML + dev-perl/Term-ReadLine-Perl + || ( + media-libs/portaudio[oss] + media-libs/portaudio[alsa] + ) + hamlib? ( media-libs/hamlib:= ) + pulseaudio? ( media-libs/libpulse ) + >=media-libs/libsndfile-1.0.10" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext ) + virtual/pkgconfig" + +DOCS=( AUTHORS ChangeLog NEWS README ) + +PATCHES=( "${FILESDIR}/${PN}-drop-nullptr-definition.patch" ) + +src_prepare() { + eapply ${PATCHES[@]} + eapply_user +} + +src_configure() { + #fails to compile with -flto (bug #860405) + filter-lto + + append-cxxflags $(test-flags-CXX -std=c++14) + local myconf="" + + use cpu_flags_x86_sse && myconf="${myconf} --enable-optimizations=sse" + use cpu_flags_x86_sse2 && myconf="${myconf} --enable-optimizations=sse2" + use cpu_flags_x86_sse3 && myconf="${myconf} --enable-optimizations=sse3" + + econf ${myconf} \ + --with-sndfile \ + $(use_with hamlib) \ + $(use_enable nls) \ + $(use_with pulseaudio) \ + --without-asciidoc +} diff --git a/media-radio/fldigi/fldigi-4.2.05-r4.ebuild b/media-radio/fldigi/fldigi-4.2.05-r4.ebuild new file mode 100644 index 000000000000..0000e5a5d512 --- /dev/null +++ b/media-radio/fldigi/fldigi-4.2.05-r4.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic + +DESCRIPTION="Sound card based multimode software modem for Amateur Radio use" +HOMEPAGE="http://www.w1hkj.com" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="hamlib nls pulseaudio" +IUSE_CPU_FLAGS=" sse sse2 sse3" +IUSE+=" ${IUSE_CPU_FLAGS// / cpu_flags_x86_}" + +RDEPEND="x11-libs/fltk:1=[threads(+),xft(+)] + x11-libs/libX11 + virtual/libudev:= + media-libs/libsamplerate + media-libs/libpng:= + x11-misc/xdg-utils + dev-perl/RPC-XML + dev-perl/Term-ReadLine-Perl + || ( + media-libs/portaudio[oss] + media-libs/portaudio[alsa] + ) + hamlib? ( media-libs/hamlib:= ) + pulseaudio? ( media-libs/libpulse ) + media-libs/libsndfile" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext ) + virtual/pkgconfig" + +DOCS=( AUTHORS ChangeLog NEWS README ) + +PATCHES=( "${FILESDIR}/${PN}-drop-nullptr-definition.patch" ) + +src_prepare() { + eapply ${PATCHES[@]} + eapply_user +} + +src_configure() { + #fails to compile with -flto (bug #860405) + filter-lto + + append-cxxflags $(test-flags-CXX -std=c++14) + local myconf="" + + use cpu_flags_x86_sse && myconf="${myconf} --enable-optimizations=sse" + use cpu_flags_x86_sse2 && myconf="${myconf} --enable-optimizations=sse2" + use cpu_flags_x86_sse3 && myconf="${myconf} --enable-optimizations=sse3" + + econf ${myconf} \ + --with-sndfile \ + $(use_with hamlib) \ + $(use_enable nls) \ + $(use_with pulseaudio) \ + --without-asciidoc +} diff --git a/media-radio/fldigi/fldigi-4.2.05.ebuild b/media-radio/fldigi/fldigi-4.2.05.ebuild deleted file mode 100644 index aa2d0d47b2cd..000000000000 --- a/media-radio/fldigi/fldigi-4.2.05.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic - -DESCRIPTION="Sound card based multimode software modem for Amateur Radio use" -HOMEPAGE="http://www.w1hkj.com" -SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="hamlib nls pulseaudio" -IUSE_CPU_FLAGS=" sse sse2 sse3" -IUSE+=" ${IUSE_CPU_FLAGS// / cpu_flags_x86_}" - -RDEPEND="x11-libs/fltk:1[threads,xft] - media-libs/libsamplerate - media-libs/libpng:0 - x11-misc/xdg-utils - dev-perl/RPC-XML - dev-perl/Term-ReadLine-Perl - || ( - media-libs/portaudio[oss] - media-libs/portaudio[alsa] - ) - hamlib? ( media-libs/hamlib:= ) - pulseaudio? ( media-libs/libpulse ) - >=media-libs/libsndfile-1.0.10" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext ) - virtual/pkgconfig" - -DOCS=( AUTHORS ChangeLog NEWS README ) - -PATCHES=( "${FILESDIR}/${PN}-drop-nullptr-definition.patch" ) - -src_prepare() { - eapply ${PATCHES[@]} - eapply_user -} - -src_configure() { - #fails to compile with -flto (bug #860405) - filter-lto - - append-cxxflags $(test-flags-CXX -std=c++14) - local myconf="" - - use cpu_flags_x86_sse && myconf="${myconf} --enable-optimizations=sse" - use cpu_flags_x86_sse2 && myconf="${myconf} --enable-optimizations=sse2" - use cpu_flags_x86_sse3 && myconf="${myconf} --enable-optimizations=sse3" - - econf ${myconf} \ - --with-sndfile \ - $(use_with hamlib) \ - $(use_enable nls) \ - $(use_with pulseaudio) \ - --without-asciidoc -} diff --git a/media-radio/fldigi/fldigi-4.2.06-r1.ebuild b/media-radio/fldigi/fldigi-4.2.06-r1.ebuild new file mode 100644 index 000000000000..b0b75c7dc433 --- /dev/null +++ b/media-radio/fldigi/fldigi-4.2.06-r1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic + +DESCRIPTION="Sound card based multimode software modem for Amateur Radio use" +HOMEPAGE="http://www.w1hkj.com" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="hamlib nls pulseaudio" +IUSE_CPU_FLAGS=" sse sse2 sse3" +IUSE+=" ${IUSE_CPU_FLAGS// / cpu_flags_x86_}" + +RDEPEND="x11-libs/fltk:1=[threads(+),xft(+)] + x11-libs/libX11 + virtual/libudev:= + media-libs/libsamplerate + media-libs/libpng:= + x11-misc/xdg-utils + dev-perl/RPC-XML + dev-perl/Term-ReadLine-Perl + || ( + media-libs/portaudio[oss] + media-libs/portaudio[alsa] + ) + hamlib? ( media-libs/hamlib:= ) + pulseaudio? ( media-libs/libpulse ) + media-libs/libsndfile" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext ) + virtual/pkgconfig" + +DOCS=( AUTHORS ChangeLog NEWS README ) + +PATCHES=( "${FILESDIR}/${PN}-drop-nullptr-definition.patch" ) + +src_prepare() { + eapply ${PATCHES[@]} + eapply_user +} + +src_configure() { + #fails to compile with -flto (bug #860405) + filter-lto + + append-cxxflags $(test-flags-CXX -std=c++14) + local myconf="" + + use cpu_flags_x86_sse && myconf="${myconf} --enable-optimizations=sse" + use cpu_flags_x86_sse2 && myconf="${myconf} --enable-optimizations=sse2" + use cpu_flags_x86_sse3 && myconf="${myconf} --enable-optimizations=sse3" + + econf ${myconf} \ + --with-sndfile \ + $(use_with hamlib) \ + $(use_enable nls) \ + $(use_with pulseaudio) \ + --without-asciidoc +} diff --git a/media-radio/fldigi/fldigi-4.2.06.ebuild b/media-radio/fldigi/fldigi-4.2.06.ebuild deleted file mode 100644 index 70988d0dc8ed..000000000000 --- a/media-radio/fldigi/fldigi-4.2.06.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic - -DESCRIPTION="Sound card based multimode software modem for Amateur Radio use" -HOMEPAGE="http://www.w1hkj.com" -SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="hamlib nls pulseaudio" -IUSE_CPU_FLAGS=" sse sse2 sse3" -IUSE+=" ${IUSE_CPU_FLAGS// / cpu_flags_x86_}" - -RDEPEND="x11-libs/fltk:1[threads,xft] - x11-libs/libX11 - virtual/libudev:= - media-libs/libsamplerate - media-libs/libpng:= - x11-misc/xdg-utils - dev-perl/RPC-XML - dev-perl/Term-ReadLine-Perl - || ( - media-libs/portaudio[oss] - media-libs/portaudio[alsa] - ) - hamlib? ( media-libs/hamlib:= ) - pulseaudio? ( media-libs/libpulse ) - media-libs/libsndfile" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext ) - virtual/pkgconfig" - -DOCS=( AUTHORS ChangeLog NEWS README ) - -PATCHES=( "${FILESDIR}/${PN}-drop-nullptr-definition.patch" ) - -src_prepare() { - eapply ${PATCHES[@]} - eapply_user -} - -src_configure() { - #fails to compile with -flto (bug #860405) - filter-lto - - append-cxxflags $(test-flags-CXX -std=c++14) - local myconf="" - - use cpu_flags_x86_sse && myconf="${myconf} --enable-optimizations=sse" - use cpu_flags_x86_sse2 && myconf="${myconf} --enable-optimizations=sse2" - use cpu_flags_x86_sse3 && myconf="${myconf} --enable-optimizations=sse3" - - econf ${myconf} \ - --with-sndfile \ - $(use_with hamlib) \ - $(use_enable nls) \ - $(use_with pulseaudio) \ - --without-asciidoc -} -- cgit v1.2.3-65-gdbad From f717f2d4381483c18b67d2c2d5a8fc675d78eaed Mon Sep 17 00:00:00 2001 From: Ionen Wolkens <ionen@gentoo.org> Date: Thu, 26 Dec 2024 02:18:09 -0500 Subject: media-radio/flrig: add binding := to fltk, soname changed Signed-off-by: Ionen Wolkens <ionen@gentoo.org> --- media-radio/flrig/flrig-2.0.05-r1.ebuild | 41 ++++++++++++++++++++++++++++++++ media-radio/flrig/flrig-2.0.05.ebuild | 41 -------------------------------- 2 files changed, 41 insertions(+), 41 deletions(-) create mode 100644 media-radio/flrig/flrig-2.0.05-r1.ebuild delete mode 100644 media-radio/flrig/flrig-2.0.05.ebuild diff --git a/media-radio/flrig/flrig-2.0.05-r1.ebuild b/media-radio/flrig/flrig-2.0.05-r1.ebuild new file mode 100644 index 000000000000..9733acc79669 --- /dev/null +++ b/media-radio/flrig/flrig-2.0.05-r1.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic + +DESCRIPTION="Transceiver control program for Amateur Radio use" +HOMEPAGE="http://www.w1hkj.com/flrig-help/index.html" +SRC_URI="https://downloads.sourceforge.net/fldigi/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="nls" + +DOCS=(AUTHORS ChangeLog README) + +RDEPEND="x11-libs/libX11 + x11-libs/fltk:1= + x11-misc/xdg-utils" + +DEPEND="${RDEPEND} + sys-devel/gettext" + +PATCHES=( + "${FILESDIR}/${PN}-2.0.05-musl.patch" + "${FILESDIR}/${PN}-2.0.04-stdint.patch" + ) + +src_prepare() { + eapply ${PATCHES[@]} + eapply_user +} + +src_configure() { + #fails to compile with -flto (bug #860408) + filter-lto + + econf +} diff --git a/media-radio/flrig/flrig-2.0.05.ebuild b/media-radio/flrig/flrig-2.0.05.ebuild deleted file mode 100644 index 25bc5e2d23c2..000000000000 --- a/media-radio/flrig/flrig-2.0.05.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic - -DESCRIPTION="Transceiver control program for Amateur Radio use" -HOMEPAGE="http://www.w1hkj.com/flrig-help/index.html" -SRC_URI="https://downloads.sourceforge.net/fldigi/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="nls" - -DOCS=(AUTHORS ChangeLog README) - -RDEPEND="x11-libs/libX11 - x11-libs/fltk:1 - x11-misc/xdg-utils" - -DEPEND="${RDEPEND} - sys-devel/gettext" - -PATCHES=( - "${FILESDIR}/${PN}-2.0.05-musl.patch" - "${FILESDIR}/${PN}-2.0.04-stdint.patch" - ) - -src_prepare() { - eapply ${PATCHES[@]} - eapply_user -} - -src_configure() { - #fails to compile with -flto (bug #860408) - filter-lto - - econf -} -- cgit v1.2.3-65-gdbad From 12c685f5ed28d8785079cb232f07f1ef180d8bc4 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens <ionen@gentoo.org> Date: Thu, 26 Dec 2024 02:18:26 -0500 Subject: media-sound/alsa-tools: add binding := to fltk, soname changed Also cleanup lower bound, <1.3.0 is long gone. Signed-off-by: Ionen Wolkens <ionen@gentoo.org> --- media-sound/alsa-tools/alsa-tools-1.2.11-r1.ebuild | 158 +++++++++++++++++++++ media-sound/alsa-tools/alsa-tools-1.2.11.ebuild | 158 --------------------- 2 files changed, 158 insertions(+), 158 deletions(-) create mode 100644 media-sound/alsa-tools/alsa-tools-1.2.11-r1.ebuild delete mode 100644 media-sound/alsa-tools/alsa-tools-1.2.11.ebuild diff --git a/media-sound/alsa-tools/alsa-tools-1.2.11-r1.ebuild b/media-sound/alsa-tools/alsa-tools-1.2.11-r1.ebuild new file mode 100644 index 000000000000..1046768052a0 --- /dev/null +++ b/media-sound/alsa-tools/alsa-tools-1.2.11-r1.ebuild @@ -0,0 +1,158 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic libtool xdg + +DESCRIPTION="Advanced Linux Sound Architecture tools" +HOMEPAGE="https://alsa-project.org/wiki/Main_Page" +SRC_URI="https://www.alsa-project.org/files/pub/tools/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0.9" +KEYWORDS="~alpha amd64 ~arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86" + +IUSE="fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart +alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe +alsa_cards_emu10k1 alsa_cards_emu10k1x alsa_cards_ice1712 +alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr" + +# bug #468294 +DEPEND=" + >=media-libs/alsa-lib-${PV} + >=dev-python/pyalsa-1.0.26 + fltk? ( x11-libs/fltk:1= ) + gtk? ( + dev-libs/gobject-introspection + x11-libs/gtk+:2 + x11-libs/gtk+:3 + ) +" +# bug #456114 +RDEPEND=" + ${DEPEND} + gtk? ( media-fonts/font-misc-misc ) +" +BDEPEND=" + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/envy24control-config-dir.patch +) + +pkg_setup() { + ALSA_TOOLS=( + seq/sbiload + us428control + hwmixvolume + hda-verb + $(usev alsa_cards_mixart mixartloader) + $(usev alsa_cards_vx222 vxloader) + $(usev alsa_cards_usb-usx2y usx2yloader) + $(usev alsa_cards_pcxhr pcxhrloader) + $(usev alsa_cards_sscape sscape_ctl) + ) + + if use gtk; then + ALSA_TOOLS+=( + echomixer + hdajackretask + $(usev alsa_cards_ice1712 envy24control) + ) + # Perhaps a typo the following && logic? + if use alsa_cards_rme32 && use alsa_cards_rme96 ; then + ALSA_TOOLS+=( rmedigicontrol ) + fi + fi + + if use alsa_cards_hdsp || use alsa_cards_hdspm ; then + ALSA_TOOLS+=( + hdsploader + $(usev fltk 'hdspconf hdspmixer') + ) + fi + + if use alsa_cards_sb16 || use alsa_cards_sbawe ; then + ALSA_TOOLS+=( sb16_csp ) + fi + + if use alsa_cards_emu10k1 || use alsa_cards_emu10k1x; then + ALSA_TOOLS+=( as10k1 ld10k1 ) + fi +} + +src_prepare() { + default + + # This block only deals with the tools that still use GTK and the + # AM_PATH_GTK macro. + for dir in echomixer envy24control rmedigicontrol; do + has "${dir}" "${ALSA_TOOLS[*]}" || continue + pushd "${dir}" &> /dev/null || die + eautoreconf + popd &> /dev/null || die + done + + # This block deals with the tools that are being patched + for dir in hdspconf; do + has "${dir}" "${ALSA_TOOLS[*]}" || continue + pushd "${dir}" &> /dev/null || die + eautoreconf + popd &> /dev/null || die + done + + elibtoolize +} + +src_configure() { + if use fltk; then + # hdspmixer requires fltk + append-ldflags "-L$(dirname $(fltk-config --libs))" + append-flags "-I$(fltk-config --includedir)" + fi + + local f + for f in ${ALSA_TOOLS[@]} ; do + cd "${S}/${f}" || die + case "${f}" in + echomixer,envy24control,rmedigicontrol ) + econf --with-gtk2 + ;; + * ) + econf + ;; + esac + done +} + +src_compile() { + local f + for f in ${ALSA_TOOLS[@]} ; do + cd "${S}/${f}" || die + emake + done +} + +src_install() { + local f + for f in ${ALSA_TOOLS[@]} ; do + # Install the main stuff + cd "${S}/${f}" || die + # hotplugdir is for usx2yloader/Makefile.am + emake DESTDIR="${D}" hotplugdir=/lib/firmware install + + # Install the text documentation + local doc + for doc in README TODO ChangeLog AUTHORS; do + if [[ -f "${doc}" ]]; then + mv "${doc}" "${doc}.$(basename ${f})" || die + dodoc "${doc}.$(basename ${f})" + fi + done + done + + # Punt at least /usr/lib/liblo10k1.la (last checked, 1.0.27) + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/media-sound/alsa-tools/alsa-tools-1.2.11.ebuild b/media-sound/alsa-tools/alsa-tools-1.2.11.ebuild deleted file mode 100644 index 800ea4ac7faf..000000000000 --- a/media-sound/alsa-tools/alsa-tools-1.2.11.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic libtool xdg - -DESCRIPTION="Advanced Linux Sound Architecture tools" -HOMEPAGE="https://alsa-project.org/wiki/Main_Page" -SRC_URI="https://www.alsa-project.org/files/pub/tools/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0.9" -KEYWORDS="~alpha amd64 ~arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86" - -IUSE="fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart -alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe -alsa_cards_emu10k1 alsa_cards_emu10k1x alsa_cards_ice1712 -alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr" - -# bug #468294 -DEPEND=" - >=media-libs/alsa-lib-${PV} - >=dev-python/pyalsa-1.0.26 - fltk? ( >=x11-libs/fltk-1.3.0:1 ) - gtk? ( - dev-libs/gobject-introspection - x11-libs/gtk+:2 - x11-libs/gtk+:3 - ) -" -# bug #456114 -RDEPEND=" - ${DEPEND} - gtk? ( media-fonts/font-misc-misc ) -" -BDEPEND=" - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/envy24control-config-dir.patch -) - -pkg_setup() { - ALSA_TOOLS=( - seq/sbiload - us428control - hwmixvolume - hda-verb - $(usev alsa_cards_mixart mixartloader) - $(usev alsa_cards_vx222 vxloader) - $(usev alsa_cards_usb-usx2y usx2yloader) - $(usev alsa_cards_pcxhr pcxhrloader) - $(usev alsa_cards_sscape sscape_ctl) - ) - - if use gtk; then - ALSA_TOOLS+=( - echomixer - hdajackretask - $(usev alsa_cards_ice1712 envy24control) - ) - # Perhaps a typo the following && logic? - if use alsa_cards_rme32 && use alsa_cards_rme96 ; then - ALSA_TOOLS+=( rmedigicontrol ) - fi - fi - - if use alsa_cards_hdsp || use alsa_cards_hdspm ; then - ALSA_TOOLS+=( - hdsploader - $(usev fltk 'hdspconf hdspmixer') - ) - fi - - if use alsa_cards_sb16 || use alsa_cards_sbawe ; then - ALSA_TOOLS+=( sb16_csp ) - fi - - if use alsa_cards_emu10k1 || use alsa_cards_emu10k1x; then - ALSA_TOOLS+=( as10k1 ld10k1 ) - fi -} - -src_prepare() { - default - - # This block only deals with the tools that still use GTK and the - # AM_PATH_GTK macro. - for dir in echomixer envy24control rmedigicontrol; do - has "${dir}" "${ALSA_TOOLS[*]}" || continue - pushd "${dir}" &> /dev/null || die - eautoreconf - popd &> /dev/null || die - done - - # This block deals with the tools that are being patched - for dir in hdspconf; do - has "${dir}" "${ALSA_TOOLS[*]}" || continue - pushd "${dir}" &> /dev/null || die - eautoreconf - popd &> /dev/null || die - done - - elibtoolize -} - -src_configure() { - if use fltk; then - # hdspmixer requires fltk - append-ldflags "-L$(dirname $(fltk-config --libs))" - append-flags "-I$(fltk-config --includedir)" - fi - - local f - for f in ${ALSA_TOOLS[@]} ; do - cd "${S}/${f}" || die - case "${f}" in - echomixer,envy24control,rmedigicontrol ) - econf --with-gtk2 - ;; - * ) - econf - ;; - esac - done -} - -src_compile() { - local f - for f in ${ALSA_TOOLS[@]} ; do - cd "${S}/${f}" || die - emake - done -} - -src_install() { - local f - for f in ${ALSA_TOOLS[@]} ; do - # Install the main stuff - cd "${S}/${f}" || die - # hotplugdir is for usx2yloader/Makefile.am - emake DESTDIR="${D}" hotplugdir=/lib/firmware install - - # Install the text documentation - local doc - for doc in README TODO ChangeLog AUTHORS; do - if [[ -f "${doc}" ]]; then - mv "${doc}" "${doc}.$(basename ${f})" || die - dodoc "${doc}.$(basename ${f})" - fi - done - done - - # Punt at least /usr/lib/liblo10k1.la (last checked, 1.0.27) - find "${ED}" -type f -name '*.la' -delete || die -} -- cgit v1.2.3-65-gdbad From b4e957dd5069f8642e52a78d2dc5e1f763a9f8df Mon Sep 17 00:00:00 2001 From: Ionen Wolkens <ionen@gentoo.org> Date: Thu, 26 Dec 2024 02:21:40 -0500 Subject: media-sound/alsamixergui: add binding := to fltk, soname changed Signed-off-by: Ionen Wolkens <ionen@gentoo.org> --- .../alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild | 49 ---------------------- .../alsamixergui/alsamixergui-0.9.0.1.2-r5.ebuild | 49 ++++++++++++++++++++++ 2 files changed, 49 insertions(+), 49 deletions(-) delete mode 100644 media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild create mode 100644 media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r5.ebuild diff --git a/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild b/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild deleted file mode 100644 index aed21c078e94..000000000000 --- a/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools desktop flag-o-matic - -MY_P=${PN}-0.9.0rc1-2 - -DESCRIPTION="FLTK based amixer Frontend" -HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" -SRC_URI="mirror://gentoo/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm ppc ppc64 sparc x86" - -RDEPEND=" - media-libs/alsa-lib:= - media-sound/alsa-utils - x11-libs/fltk:1" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-gcc34.patch - "${FILESDIR}"/segfault-on-exit.patch - "${FILESDIR}"/${P}-fltk-1.1.patch - "${FILESDIR}"/${P}-strsignal.patch -) - -src_prepare() { - default - mv configure.{in,ac} || die - eautoreconf -} - -src_configure() { - append-libs "-L$(dirname $(fltk-config --libs))" - append-cppflags "-I$(fltk-config --includedir)" - econf -} - -src_install() { - default - - newicon src/images/alsalogo.xpm ${PN}.xpm - make_desktop_entry ${PN} "Alsa Mixer GUI" -} diff --git a/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r5.ebuild b/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r5.ebuild new file mode 100644 index 000000000000..77b3fbda7a70 --- /dev/null +++ b/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r5.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools desktop flag-o-matic + +MY_P=${PN}-0.9.0rc1-2 + +DESCRIPTION="FLTK based amixer Frontend" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" +SRC_URI="mirror://gentoo/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm ppc ppc64 sparc x86" + +RDEPEND=" + media-libs/alsa-lib:= + media-sound/alsa-utils + x11-libs/fltk:1=" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-gcc34.patch + "${FILESDIR}"/segfault-on-exit.patch + "${FILESDIR}"/${P}-fltk-1.1.patch + "${FILESDIR}"/${P}-strsignal.patch +) + +src_prepare() { + default + mv configure.{in,ac} || die + eautoreconf +} + +src_configure() { + append-libs "-L$(dirname $(fltk-config --libs))" + append-cppflags "-I$(fltk-config --includedir)" + econf +} + +src_install() { + default + + newicon src/images/alsalogo.xpm ${PN}.xpm + make_desktop_entry ${PN} "Alsa Mixer GUI" +} -- cgit v1.2.3-65-gdbad From 8b9ef44c152d11be0e70a34ca30cb1d0bc663d45 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens <ionen@gentoo.org> Date: Thu, 26 Dec 2024 02:21:56 -0500 Subject: media-sound/gmorgan: add binding := to fltk, soname changed Signed-off-by: Ionen Wolkens <ionen@gentoo.org> --- media-sound/gmorgan/gmorgan-0.79-r3.ebuild | 46 ------------------------------ media-sound/gmorgan/gmorgan-0.79-r4.ebuild | 46 ++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 46 deletions(-) delete mode 100644 media-sound/gmorgan/gmorgan-0.79-r3.ebuild create mode 100644 media-sound/gmorgan/gmorgan-0.79-r4.ebuild diff --git a/media-sound/gmorgan/gmorgan-0.79-r3.ebuild b/media-sound/gmorgan/gmorgan-0.79-r3.ebuild deleted file mode 100644 index c89a4bf0972a..000000000000 --- a/media-sound/gmorgan/gmorgan-0.79-r3.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="Opensource software rhythm station" -HOMEPAGE="https://gmorgan.sourceforge.net/" -SRC_URI="https://downloads.sourceforge.net/gmorgan/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="nls" - -RDEPEND=" - media-libs/alsa-lib - x11-libs/fltk:1" -DEPEND="${RDEPEND}" -BDEPEND="nls? ( sys-devel/gettext )" - -PATCHES=( - "${FILESDIR}"/${P}-remove-gettext-version-check.patch - "${FILESDIR}"/${P}-manpages.patch - "${FILESDIR}"/${P}-remove-dirs.patch - "${FILESDIR}"/${P}-remove-old-docs.patch - "${FILESDIR}"/${P}-gcc6.patch - "${FILESDIR}"/${P}-clang.patch - "${FILESDIR}"/${P}-clang16.patch -) - -src_prepare() { - default - sed -i -e "s#/usr/local/share/#/usr/share/#" src/gmorgan.chord.cpp || die - eautoreconf -} - -src_configure() { - econf $(use_enable nls) -} - -src_install() { - default - doman man/gmorgan.1 -} diff --git a/media-sound/gmorgan/gmorgan-0.79-r4.ebuild b/media-sound/gmorgan/gmorgan-0.79-r4.ebuild new file mode 100644 index 000000000000..56367ad31493 --- /dev/null +++ b/media-sound/gmorgan/gmorgan-0.79-r4.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Opensource software rhythm station" +HOMEPAGE="https://gmorgan.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/gmorgan/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="nls" + +RDEPEND=" + media-libs/alsa-lib + x11-libs/fltk:1=" +DEPEND="${RDEPEND}" +BDEPEND="nls? ( sys-devel/gettext )" + +PATCHES=( + "${FILESDIR}"/${P}-remove-gettext-version-check.patch + "${FILESDIR}"/${P}-manpages.patch + "${FILESDIR}"/${P}-remove-dirs.patch + "${FILESDIR}"/${P}-remove-old-docs.patch + "${FILESDIR}"/${P}-gcc6.patch + "${FILESDIR}"/${P}-clang.patch + "${FILESDIR}"/${P}-clang16.patch +) + +src_prepare() { + default + sed -i -e "s#/usr/local/share/#/usr/share/#" src/gmorgan.chord.cpp || die + eautoreconf +} + +src_configure() { + econf $(use_enable nls) +} + +src_install() { + default + doman man/gmorgan.1 +} -- cgit v1.2.3-65-gdbad From 70e95cedb289853d9b1ca1f50420527e23c4eaed Mon Sep 17 00:00:00 2001 From: Ionen Wolkens <ionen@gentoo.org> Date: Thu, 26 Dec 2024 02:22:24 -0500 Subject: media-sound/horgand: add binding := to fltk & fix build with 1.4 1.4.x drops the case sensitivity compat symlinks by default and upstream strongly recommends to fix packages rather than re-enable them. := due to new soname Signed-off-by: Ionen Wolkens <ionen@gentoo.org> --- .../horgand/files/horgand-1.14-fltk1.4.patch | 6 ++++ media-sound/horgand/horgand-1.14-r2.ebuild | 39 -------------------- media-sound/horgand/horgand-1.14-r3.ebuild | 42 ++++++++++++++++++++++ 3 files changed, 48 insertions(+), 39 deletions(-) create mode 100644 media-sound/horgand/files/horgand-1.14-fltk1.4.patch delete mode 100644 media-sound/horgand/horgand-1.14-r2.ebuild create mode 100644 media-sound/horgand/horgand-1.14-r3.ebuild diff --git a/media-sound/horgand/files/horgand-1.14-fltk1.4.patch b/media-sound/horgand/files/horgand-1.14-fltk1.4.patch new file mode 100644 index 000000000000..df106161e1fb --- /dev/null +++ b/media-sound/horgand/files/horgand-1.14-fltk1.4.patch @@ -0,0 +1,6 @@ +Deprecated compatibility symlinks are removed. +--- a/src/organ.C ++++ b/src/organ.C +@@ -31 +31 @@ +-#include <Fl/Fl_Preferences.H> ++#include <FL/Fl_Preferences.H> diff --git a/media-sound/horgand/horgand-1.14-r2.ebuild b/media-sound/horgand/horgand-1.14-r2.ebuild deleted file mode 100644 index 6506e49d4be4..000000000000 --- a/media-sound/horgand/horgand-1.14-r2.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop toolchain-funcs - -DESCRIPTION="Opensource software organ" -HOMEPAGE="https://sourceforge.net/projects/horgand.berlios/" -SRC_URI="https://download.sourceforge.net/${PN}.berlios/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc sparc x86" - -RDEPEND=" - media-libs/alsa-lib - media-libs/libsndfile - media-sound/alsa-utils - virtual/jack - x11-libs/fltk:1 - x11-libs/libXpm -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( "${FILESDIR}/${P}-overflow.patch" ) - -src_compile() { - emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} $(fltk-config --cxxflags) \ - $($(tc-getPKG_CONFIG) --cflags jack) $($(tc-getPKG_CONFIG) --cflags sndfile)" -} - -src_install() { - default - doman man/${PN}.1 - newicon src/${PN}128.xpm ${PN}.xpm - make_desktop_entry ${PN} Horgand ${PN} -} diff --git a/media-sound/horgand/horgand-1.14-r3.ebuild b/media-sound/horgand/horgand-1.14-r3.ebuild new file mode 100644 index 000000000000..b4bd54ce0304 --- /dev/null +++ b/media-sound/horgand/horgand-1.14-r3.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop toolchain-funcs + +DESCRIPTION="Opensource software organ" +HOMEPAGE="https://sourceforge.net/projects/horgand.berlios/" +SRC_URI="https://download.sourceforge.net/${PN}.berlios/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~ppc sparc x86" + +RDEPEND=" + media-libs/alsa-lib + media-libs/libsndfile + media-sound/alsa-utils + virtual/jack + x11-libs/fltk:1= + x11-libs/libXpm +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${P}-overflow.patch" + "${FILESDIR}/${P}-fltk1.4.patch" +) + +src_compile() { + emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} $(fltk-config --cxxflags) \ + $($(tc-getPKG_CONFIG) --cflags jack) $($(tc-getPKG_CONFIG) --cflags sndfile)" +} + +src_install() { + default + doman man/${PN}.1 + newicon src/${PN}128.xpm ${PN}.xpm + make_desktop_entry ${PN} Horgand ${PN} +} -- cgit v1.2.3-65-gdbad From 782ced3c21ce86ebf9219ef01b2dc6648c19cc89 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens <ionen@gentoo.org> Date: Thu, 26 Dec 2024 02:24:57 -0500 Subject: media-sound/lmms: add binding := to fltk, soname changed Also cleanup lower bound, <1.3.0 is long gone. Signed-off-by: Ionen Wolkens <ionen@gentoo.org> --- media-sound/lmms/lmms-1.2.2-r2.ebuild | 130 ---------------------------------- media-sound/lmms/lmms-1.2.2-r3.ebuild | 130 ++++++++++++++++++++++++++++++++++ media-sound/lmms/lmms-9999.ebuild | 2 +- 3 files changed, 131 insertions(+), 131 deletions(-) delete mode 100644 media-sound/lmms/lmms-1.2.2-r2.ebuild create mode 100644 media-sound/lmms/lmms-1.2.2-r3.ebuild diff --git a/media-sound/lmms/lmms-1.2.2-r2.ebuild b/media-sound/lmms/lmms-1.2.2-r2.ebuild deleted file mode 100644 index 775db25c1d67..000000000000 --- a/media-sound/lmms/lmms-1.2.2-r2.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic xdg - -DESCRIPTION="Cross-platform music production software" -HOMEPAGE="https://lmms.io" -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/LMMS/lmms.git" - inherit git-r3 -else - SRC_URI="https://github.com/LMMS/lmms/releases/download/v${PV/_/-}/${PN}_${PV/_/-}.tar.xz" - KEYWORDS="amd64 x86" - S="${WORKDIR}/${P/_/-}" -fi - -S="${WORKDIR}/${PN}" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" - -IUSE="alsa debug fluidsynth jack libgig mp3 ogg portaudio pulseaudio sdl soundio stk test vst" - -# FAIL! : AutomatableModelTest::LinkTests() 'm1Changed' returned FALSE. () -# -# Did not previously pass, did not previously run. Maintain status quo. -# Fixed upstream in git. -RESTRICT="test" - -COMMON_DEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - >=media-libs/libsamplerate-0.1.8 - >=media-libs/libsndfile-1.0.11 - sci-libs/fftw:3.0 - sys-libs/zlib - >=x11-libs/fltk-1.3.0_rc3:1 - alsa? ( media-libs/alsa-lib ) - fluidsynth? ( media-sound/fluidsynth ) - jack? ( virtual/jack ) - libgig? ( media-libs/libgig ) - mp3? ( media-sound/lame ) - ogg? ( - media-libs/libogg - media-libs/libvorbis - ) - portaudio? ( >=media-libs/portaudio-19_pre ) - pulseaudio? ( media-libs/libpulse ) - sdl? ( - media-libs/libsdl - >=media-libs/sdl-sound-1.0.1 - ) - soundio? ( media-libs/libsoundio ) - stk? ( media-libs/stk ) - vst? ( virtual/wine ) -" -DEPEND="${COMMON_DEPEND} - dev-qt/qtx11extras:5 - test? ( dev-qt/qttest:5 ) -" -BDEPEND=" - dev-qt/linguist-tools:5 -" -RDEPEND="${COMMON_DEPEND} - media-plugins/calf - media-plugins/caps-plugins - media-plugins/cmt-plugins - media-plugins/swh-plugins - media-plugins/tap-plugins -" - -DOCS=( README.md doc/AUTHORS ) - -PATCHES=( - "${FILESDIR}/${PN}-1.2.2-no_compress_man.patch" #733284 - "${FILESDIR}/${PN}-1.2.2-plugin-path.patch" #907285 - "${FILESDIR}/${PN}-1.2.2-kwidgetsaddons.patch" -) - -src_prepare() { - cmake_src_prepare - - if use !test; then - sed -i '/ADD_SUBDIRECTORY(tests)/d' CMakeLists.txt || die - fi -} - -src_configure() { - # -Werror=odr - # https://bugs.gentoo.org/860867 - # https://github.com/LMMS/lmms/pull/6174 - # - # Fixed upstream, remove whenever they finally release a new version. - filter-lto - - local mycmakeargs=( - -DUSE_WERROR=FALSE - -DWANT_CAPS=FALSE - -DWANT_TAP=FALSE - -DWANT_SWH=FALSE - -DWANT_CMT=FALSE - -DWANT_CALF=FALSE - -DWANT_QT5=TRUE - -DWANT_ALSA=$(usex alsa) - -DWANT_JACK=$(usex jack) - -DWANT_GIG=$(usex libgig) - -DWANT_MP3LAME=$(usex mp3) - -DWANT_OGGVORBIS=$(usex ogg) - -DWANT_PORTAUDIO=$(usex portaudio) - -DWANT_PULSEAUDIO=$(usex pulseaudio) - -DWANT_SDL=$(usex sdl) - -DWANT_SOUNDIO=$(usex soundio) - -DWANT_STK=$(usex stk) - -DWANT_VST=$(usex vst) - -DWANT_SF2=$(usex fluidsynth) - ) - - cmake_src_configure -} - -src_test() { - # does not use ctest - cmake_build tests/tests - "${BUILD_DIR}"/tests/tests || die - -} diff --git a/media-sound/lmms/lmms-1.2.2-r3.ebuild b/media-sound/lmms/lmms-1.2.2-r3.ebuild new file mode 100644 index 000000000000..3623cf5241fc --- /dev/null +++ b/media-sound/lmms/lmms-1.2.2-r3.ebuild @@ -0,0 +1,130 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic xdg + +DESCRIPTION="Cross-platform music production software" +HOMEPAGE="https://lmms.io" +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI="https://github.com/LMMS/lmms.git" + inherit git-r3 +else + SRC_URI="https://github.com/LMMS/lmms/releases/download/v${PV/_/-}/${PN}_${PV/_/-}.tar.xz" + KEYWORDS="amd64 x86" + S="${WORKDIR}/${P/_/-}" +fi + +S="${WORKDIR}/${PN}" + +LICENSE="GPL-2 LGPL-2" +SLOT="0" + +IUSE="alsa debug fluidsynth jack libgig mp3 ogg portaudio pulseaudio sdl soundio stk test vst" + +# FAIL! : AutomatableModelTest::LinkTests() 'm1Changed' returned FALSE. () +# +# Did not previously pass, did not previously run. Maintain status quo. +# Fixed upstream in git. +RESTRICT="test" + +COMMON_DEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + >=media-libs/libsamplerate-0.1.8 + >=media-libs/libsndfile-1.0.11 + sci-libs/fftw:3.0 + sys-libs/zlib + x11-libs/fltk:1= + alsa? ( media-libs/alsa-lib ) + fluidsynth? ( media-sound/fluidsynth ) + jack? ( virtual/jack ) + libgig? ( media-libs/libgig ) + mp3? ( media-sound/lame ) + ogg? ( + media-libs/libogg + media-libs/libvorbis + ) + portaudio? ( >=media-libs/portaudio-19_pre ) + pulseaudio? ( media-libs/libpulse ) + sdl? ( + media-libs/libsdl + >=media-libs/sdl-sound-1.0.1 + ) + soundio? ( media-libs/libsoundio ) + stk? ( media-libs/stk ) + vst? ( virtual/wine ) +" +DEPEND="${COMMON_DEPEND} + dev-qt/qtx11extras:5 + test? ( dev-qt/qttest:5 ) +" +BDEPEND=" + dev-qt/linguist-tools:5 +" +RDEPEND="${COMMON_DEPEND} + media-plugins/calf + media-plugins/caps-plugins + media-plugins/cmt-plugins + media-plugins/swh-plugins + media-plugins/tap-plugins +" + +DOCS=( README.md doc/AUTHORS ) + +PATCHES=( + "${FILESDIR}/${PN}-1.2.2-no_compress_man.patch" #733284 + "${FILESDIR}/${PN}-1.2.2-plugin-path.patch" #907285 + "${FILESDIR}/${PN}-1.2.2-kwidgetsaddons.patch" +) + +src_prepare() { + cmake_src_prepare + + if use !test; then + sed -i '/ADD_SUBDIRECTORY(tests)/d' CMakeLists.txt || die + fi +} + +src_configure() { + # -Werror=odr + # https://bugs.gentoo.org/860867 + # https://github.com/LMMS/lmms/pull/6174 + # + # Fixed upstream, remove whenever they finally release a new version. + filter-lto + + local mycmakeargs=( + -DUSE_WERROR=FALSE + -DWANT_CAPS=FALSE + -DWANT_TAP=FALSE + -DWANT_SWH=FALSE + -DWANT_CMT=FALSE + -DWANT_CALF=FALSE + -DWANT_QT5=TRUE + -DWANT_ALSA=$(usex alsa) + -DWANT_JACK=$(usex jack) + -DWANT_GIG=$(usex libgig) + -DWANT_MP3LAME=$(usex mp3) + -DWANT_OGGVORBIS=$(usex ogg) + -DWANT_PORTAUDIO=$(usex portaudio) + -DWANT_PULSEAUDIO=$(usex pulseaudio) + -DWANT_SDL=$(usex sdl) + -DWANT_SOUNDIO=$(usex soundio) + -DWANT_STK=$(usex stk) + -DWANT_VST=$(usex vst) + -DWANT_SF2=$(usex fluidsynth) + ) + + cmake_src_configure +} + +src_test() { + # does not use ctest + cmake_build tests/tests + "${BUILD_DIR}"/tests/tests || die + +} diff --git a/media-sound/lmms/lmms-9999.ebuild b/media-sound/lmms/lmms-9999.ebuild index f003402e4f33..8e4208f20432 100644 --- a/media-sound/lmms/lmms-9999.ebuild +++ b/media-sound/lmms/lmms-9999.ebuild @@ -32,7 +32,7 @@ COMMON_DEPEND=" >=media-libs/libsndfile-1.0.11 sci-libs/fftw:3.0 sys-libs/zlib - >=x11-libs/fltk-1.3.0_rc3:1 + x11-libs/fltk:1= alsa? ( media-libs/alsa-lib ) fluidsynth? ( media-sound/fluidsynth ) jack? ( virtual/jack ) -- cgit v1.2.3-65-gdbad From 89e3b5173c542d83854cc5999e6a431cb2d8a7e8 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens <ionen@gentoo.org> Date: Thu, 26 Dec 2024 02:25:41 -0500 Subject: media-sound/mup: add binding := to fltk & fix build with 1.4 1.4.x seems to have dropped some transitive includes, and this needs to include what it uses. := due to new soname Also cleanup lower bound, <1.3.0 is long gone. Signed-off-by: Ionen Wolkens <ionen@gentoo.org> --- media-sound/mup/files/mup-6.9-fltk1.4.patch | 11 ++++++ media-sound/mup/mup-6.9-r1.ebuild | 55 +++++++++++++++++++++++++++++ media-sound/mup/mup-6.9.ebuild | 54 ---------------------------- 3 files changed, 66 insertions(+), 54 deletions(-) create mode 100644 media-sound/mup/files/mup-6.9-fltk1.4.patch create mode 100644 media-sound/mup/mup-6.9-r1.ebuild delete mode 100644 media-sound/mup/mup-6.9.ebuild diff --git a/media-sound/mup/files/mup-6.9-fltk1.4.patch b/media-sound/mup/files/mup-6.9-fltk1.4.patch new file mode 100644 index 000000000000..f01ebc012e5b --- /dev/null +++ b/media-sound/mup/files/mup-6.9-fltk1.4.patch @@ -0,0 +1,11 @@ +Main.C:751:9: error: 'fl_register_images' was not declared ... +--- a/src/mupmate/Main.C ++++ b/src/mupmate/Main.C +@@ -68,6 +68,7 @@ + + #include <FL/Fl.H> + #include <FL/fl_ask.H> ++#include <FL/Fl_Shared_Image.H> + #include <FL/Fl_Tooltip.H> + + #include "globals.H" diff --git a/media-sound/mup/mup-6.9-r1.ebuild b/media-sound/mup/mup-6.9-r1.ebuild new file mode 100644 index 000000000000..2f88bd35ad21 --- /dev/null +++ b/media-sound/mup/mup-6.9-r1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools toolchain-funcs + +DESCRIPTION="Program for printing music scores" +HOMEPAGE="http://www.arkkra.com/" +SRC_URI="http://www.arkkra.com/ftp/pub/unix/mup${PV//.}src.tar.gz + ftp://ftp.arkkra.com/pub/unix/mup${PV//.}src.tar.gz" + +LICENSE="Arkkra" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" + +RDEPEND=" + media-libs/libjpeg-turbo:= + media-libs/libpng:= + x11-libs/libX11 + x11-libs/libXext + x11-libs/fltk:1= + x11-libs/libXpm +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +BDEPEND=" + app-text/ghostscript-gpl + media-libs/netpbm + sys-apps/groff + app-alternatives/yacc +" + +PATCHES=( + "${FILESDIR}"/${PN}-6.9-build-system.patch + "${FILESDIR}"/${PN}-6.9-fltk1.4.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_compile() { + emake -j1 CCOMPILER="$(tc-getCC)" CPPCOMPILER="$(tc-getCXX)" CFLAGS="${CFLAGS}" +} + +src_install() { + emake -j1 DESTDIR="${D}" install + + dodoc README +} diff --git a/media-sound/mup/mup-6.9.ebuild b/media-sound/mup/mup-6.9.ebuild deleted file mode 100644 index 64e1202d55d3..000000000000 --- a/media-sound/mup/mup-6.9.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools toolchain-funcs - -DESCRIPTION="Program for printing music scores" -HOMEPAGE="http://www.arkkra.com/" -SRC_URI="http://www.arkkra.com/ftp/pub/unix/mup${PV//.}src.tar.gz - ftp://ftp.arkkra.com/pub/unix/mup${PV//.}src.tar.gz" - -LICENSE="Arkkra" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" - -RDEPEND=" - media-libs/libjpeg-turbo:= - media-libs/libpng:= - x11-libs/libX11 - x11-libs/libXext - >=x11-libs/fltk-1.3:1 - x11-libs/libXpm -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto -" -BDEPEND=" - app-text/ghostscript-gpl - media-libs/netpbm - sys-apps/groff - app-alternatives/yacc -" - -PATCHES=( - "${FILESDIR}"/${PN}-6.9-build-system.patch -) - -src_prepare() { - default - - eautoreconf -} - -src_compile() { - emake -j1 CCOMPILER="$(tc-getCC)" CPPCOMPILER="$(tc-getCXX)" CFLAGS="${CFLAGS}" -} - -src_install() { - emake -j1 DESTDIR="${D}" install - - dodoc README -} -- cgit v1.2.3-65-gdbad From 77526e7efa64cb62f7246fc05ab948878118ad5d Mon Sep 17 00:00:00 2001 From: Ionen Wolkens <ionen@gentoo.org> Date: Thu, 26 Dec 2024 02:40:40 -0500 Subject: media-sound/yoshimi: add binding := to fltk & fix build with 1.4 1.4.x seems to have dropped some transitive includes, and this needs to include what it uses. := due to new soname Have not tried wayland (new in fltk-1.4), but given the build fix revealed that it uses some X-specific bits, odds are it'll be broken without fltk[X(+)] and so added that as well. Signed-off-by: Ionen Wolkens <ionen@gentoo.org> --- .../yoshimi/files/yoshimi-2.3.3.1-fltk1.4.patch | 15 ++++++ media-sound/yoshimi/yoshimi-2.3.3.1-r1.ebuild | 53 ++++++++++++++++++++++ media-sound/yoshimi/yoshimi-2.3.3.1.ebuild | 49 -------------------- media-sound/yoshimi/yoshimi-2.3.3.2-r1.ebuild | 53 ++++++++++++++++++++++ media-sound/yoshimi/yoshimi-2.3.3.2.ebuild | 49 -------------------- 5 files changed, 121 insertions(+), 98 deletions(-) create mode 100644 media-sound/yoshimi/files/yoshimi-2.3.3.1-fltk1.4.patch create mode 100644 media-sound/yoshimi/yoshimi-2.3.3.1-r1.ebuild delete mode 100644 media-sound/yoshimi/yoshimi-2.3.3.1.ebuild create mode 100644 media-sound/yoshimi/yoshimi-2.3.3.2-r1.ebuild delete mode 100644 media-sound/yoshimi/yoshimi-2.3.3.2.ebuild diff --git a/media-sound/yoshimi/files/yoshimi-2.3.3.1-fltk1.4.patch b/media-sound/yoshimi/files/yoshimi-2.3.3.1-fltk1.4.patch new file mode 100644 index 000000000000..e3266ce7af7a --- /dev/null +++ b/media-sound/yoshimi/files/yoshimi-2.3.3.1-fltk1.4.patch @@ -0,0 +1,15 @@ +MiscGui.cpp:1434:18: error: 'fl_display' was not declared ... + +Other files are using x.H, but that header is deprecated and +the correct one is platform.H. fl_display is X-specific, so +this likely cannot work without fltk[X] at the moment. +--- a/UI/MiscGui.cpp ++++ b/UI/MiscGui.cpp +@@ -28,6 +28,7 @@ + + #include <FL/Fl.H> + #include <FL/fl_draw.H> ++#include <FL/platform.H> + + #include <cairo.h> + #include <cairo-xlib.h> diff --git a/media-sound/yoshimi/yoshimi-2.3.3.1-r1.ebuild b/media-sound/yoshimi/yoshimi-2.3.3.1-r1.ebuild new file mode 100644 index 000000000000..d25e3732e7d9 --- /dev/null +++ b/media-sound/yoshimi/yoshimi-2.3.3.1-r1.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic xdg + +DESCRIPTION="Software synthesizer based on ZynAddSubFX" +HOMEPAGE="https://yoshimi.github.io/" +SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P}/src" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="+lv2" + +BDEPEND="virtual/pkgconfig" +DEPEND=" + dev-libs/mxml:0 + media-libs/alsa-lib + media-libs/fontconfig + media-libs/libsndfile + sci-libs/fftw:3.0= + sys-libs/ncurses:0= + sys-libs/readline:0= + sys-libs/zlib + virtual/jack + x11-libs/cairo[X] + x11-libs/fltk:1=[X(+),opengl] + lv2? ( media-libs/lv2 ) +" +RDEPEND="${DEPEND}" + +DOCS=( ../Changelog ../README.txt ) + +PATCHES=( + "${FILESDIR}"/${PN}-2.3.3.1-fltk1.4.patch +) + +src_prepare() { + cmake_src_prepare + sed -e "/^install.*doc.*DATAROOTDIR/s/${PN}/${PF}/" -i CMakeLists.txt || die + append-cxxflags -lpthread + append-cppflags -lpthread +} + +src_configure() { + local mycmakeargs=( + -DLV2Plugin=$(usex lv2) + ) + cmake_src_configure +} diff --git a/media-sound/yoshimi/yoshimi-2.3.3.1.ebuild b/media-sound/yoshimi/yoshimi-2.3.3.1.ebuild deleted file mode 100644 index d52b5bb9ab3d..000000000000 --- a/media-sound/yoshimi/yoshimi-2.3.3.1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic xdg - -DESCRIPTION="Software synthesizer based on ZynAddSubFX" -HOMEPAGE="https://yoshimi.github.io/" -SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${P}/src" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="+lv2" - -BDEPEND="virtual/pkgconfig" -DEPEND=" - dev-libs/mxml:0 - media-libs/alsa-lib - media-libs/fontconfig - media-libs/libsndfile - sci-libs/fftw:3.0= - sys-libs/ncurses:0= - sys-libs/readline:0= - sys-libs/zlib - virtual/jack - x11-libs/cairo[X] - x11-libs/fltk:1[opengl] - lv2? ( media-libs/lv2 ) -" -RDEPEND="${DEPEND}" - -DOCS=( ../Changelog ../README.txt ) - -src_prepare() { - cmake_src_prepare - sed -e "/^install.*doc.*DATAROOTDIR/s/${PN}/${PF}/" -i CMakeLists.txt || die - append-cxxflags -lpthread - append-cppflags -lpthread -} - -src_configure() { - local mycmakeargs=( - -DLV2Plugin=$(usex lv2) - ) - cmake_src_configure -} diff --git a/media-sound/yoshimi/yoshimi-2.3.3.2-r1.ebuild b/media-sound/yoshimi/yoshimi-2.3.3.2-r1.ebuild new file mode 100644 index 000000000000..67ffcae93119 --- /dev/null +++ b/media-sound/yoshimi/yoshimi-2.3.3.2-r1.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic xdg + +DESCRIPTION="Software synthesizer based on ZynAddSubFX" +HOMEPAGE="https://yoshimi.github.io/" +SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P}/src" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+lv2" + +BDEPEND="virtual/pkgconfig" +DEPEND=" + dev-libs/mxml:0 + media-libs/alsa-lib + media-libs/fontconfig + media-libs/libsndfile + sci-libs/fftw:3.0= + sys-libs/ncurses:0= + sys-libs/readline:0= + sys-libs/zlib + virtual/jack + x11-libs/cairo[X] + x11-libs/fltk:1=[X(+),opengl] + lv2? ( media-libs/lv2 ) +" +RDEPEND="${DEPEND}" + +DOCS=( ../Changelog ../README.txt ) + +PATCHES=( + "${FILESDIR}"/${PN}-2.3.3.1-fltk1.4.patch +) + +src_prepare() { + cmake_src_prepare + sed -e "/^install.*doc.*DATAROOTDIR/s/${PN}/${PF}/" -i CMakeLists.txt || die + append-cxxflags -lpthread + append-cppflags -lpthread +} + +src_configure() { + local mycmakeargs=( + -DLV2Plugin=$(usex lv2) + ) + cmake_src_configure +} diff --git a/media-sound/yoshimi/yoshimi-2.3.3.2.ebuild b/media-sound/yoshimi/yoshimi-2.3.3.2.ebuild deleted file mode 100644 index 42acb9b39317..000000000000 --- a/media-sound/yoshimi/yoshimi-2.3.3.2.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic xdg - -DESCRIPTION="Software synthesizer based on ZynAddSubFX" -HOMEPAGE="https://yoshimi.github.io/" -SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${P}/src" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+lv2" - -BDEPEND="virtual/pkgconfig" -DEPEND=" - dev-libs/mxml:0 - media-libs/alsa-lib - media-libs/fontconfig - media-libs/libsndfile - sci-libs/fftw:3.0= - sys-libs/ncurses:0= - sys-libs/readline:0= - sys-libs/zlib - virtual/jack - x11-libs/cairo[X] - x11-libs/fltk:1[opengl] - lv2? ( media-libs/lv2 ) -" -RDEPEND="${DEPEND}" - -DOCS=( ../Changelog ../README.txt ) - -src_prepare() { - cmake_src_prepare - sed -e "/^install.*doc.*DATAROOTDIR/s/${PN}/${PF}/" -i CMakeLists.txt || die - append-cxxflags -lpthread - append-cppflags -lpthread -} - -src_configure() { - local mycmakeargs=( - -DLV2Plugin=$(usex lv2) - ) - cmake_src_configure -} -- cgit v1.2.3-65-gdbad From 6bcdeca2992393180123ea4bd7de91184b9314e2 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens <ionen@gentoo.org> Date: Thu, 26 Dec 2024 02:43:18 -0500 Subject: media-sound/zynaddsubfx: add binding := to fltk & fix build with 1.4 1.4.x seems to have dropped some transitive includes, and this needs to include what it uses. := due to new soname Have not tried wayland (new in fltk-1.4), but given the build fix revealed that it uses some X-specific bits, odds are it'll be broken without fltk[X(+)] and so added that as well. ~arch version dropped fltk so this is just for stable, but had to do a no-op ~arch revbump only to prevent the stable revbump from becoming a higher revision. Signed-off-by: Ionen Wolkens <ionen@gentoo.org> --- .../files/zynaddsubfx-3.0.6-fltk1.4.patch | 20 ++++ .../zynaddsubfx/zynaddsubfx-3.0.6-r3.ebuild | 91 ---------------- .../zynaddsubfx/zynaddsubfx-3.0.6-r4.ebuild | 114 --------------------- .../zynaddsubfx/zynaddsubfx-3.0.6-r5.ebuild | 92 +++++++++++++++++ .../zynaddsubfx/zynaddsubfx-3.0.6-r6.ebuild | 114 +++++++++++++++++++++ 5 files changed, 226 insertions(+), 205 deletions(-) create mode 100644 media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-fltk1.4.patch delete mode 100644 media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r3.ebuild delete mode 100644 media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r4.ebuild create mode 100644 media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r5.ebuild create mode 100644 media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r6.ebuild diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-fltk1.4.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-fltk1.4.patch new file mode 100644 index 000000000000..db1bd93ece30 --- /dev/null +++ b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-fltk1.4.patch @@ -0,0 +1,20 @@ +MasterUI.cxx:2377:3: error: 'fl_open_display' was not declared ... + +Other files are using x.H, but that header is deprecated and the +correct one is platform.H. fl_display that it alse needs platform.H +for is X-specific, so this likely cannot work without fltk[X] at +the moment. + +(next revision of the ebuild removes fltk, so it won't matter much) +--- a/src/UI/MasterUI.fl ++++ b/src/UI/MasterUI.fl +@@ -76,6 +76,9 @@ + decl {\#include "common.H"} {public local + } + ++decl {\#include "FL/platform.H"} {public local ++} ++ + decl {\#if USE_NSM + \#include "NSM.H" + extern NSM_Client *nsm; diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r3.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r3.ebuild deleted file mode 100644 index da2c1db9b0e1..000000000000 --- a/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r3.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic - -DESCRIPTION="Software synthesizer capable of making a countless number of instruments" -HOMEPAGE="https://zynaddsubfx.sourceforge.net/" -SRC_URI="https://downloads.sourceforge.net/zynaddsubfx/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="+alsa doc dssi +fltk jack lash portaudio" -REQUIRED_USE="|| ( alsa jack portaudio )" - -DEPEND=" - dev-libs/mxml:0 - media-libs/liblo - sci-libs/fftw:3.0 - sys-libs/zlib - alsa? ( media-libs/alsa-lib ) - doc? ( dev-texlive/texlive-fontutils ) - dssi? ( media-libs/dssi ) - fltk? ( - x11-libs/fltk:1 - x11-libs/libX11 - x11-libs/libXpm - ) - jack? ( virtual/jack ) - lash? ( media-sound/lash ) - portaudio? ( media-libs/portaudio ) -" -RDEPEND="${DEPEND}" -BDEPEND=" - dev-lang/ruby:* - virtual/pkgconfig - doc? ( app-text/doxygen ) -" - -PATCHES=( - "${FILESDIR}"/${P}-docs.patch - "${FILESDIR}"/${P}-stdint.patch -) - -DOCS=( AUTHORS.txt NEWS.txt README.adoc ) - -src_prepare() { - cmake_src_prepare - - if ! use dssi; then - sed -i -e '/pkg_search_module.*DSSI/s/^/#DONT/' src/CMakeLists.txt || die - fi - if ! use jack; then - sed -e '/pkg_check_modules.*JACK/s/^/#DONT/' -i {rtosc,src}/CMakeLists.txt || die - fi - if ! use lash; then - sed -i -e '/pkg_search_module.*LASH/s/^/#DONT/' src/CMakeLists.txt || die - fi - if ! use portaudio; then - sed -i -e '/pkg_check_modules.*PORTAUDIO/s/^/#DONT/' src/CMakeLists.txt || die - fi - - # FIXME upstream: sandbox error - sed -i -e '/add_subdirectory(bash-completion)/d' doc/CMakeLists.txt || die -} - -src_configure() { - append-cxxflags -std=c++11 - - local mycmakeargs=( - -DPluginLibDir=$(get_libdir) - $(cmake_use_find_package alsa Alsa) - $(cmake_use_find_package doc Doxygen) - $(cmake_use_find_package fltk FLTK) - ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile - use doc && cmake_src_compile doc -} - -src_install() { - use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) - cmake_src_install - insinto /usr/share/${PN} - doins -r instruments/* -} diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r4.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r4.ebuild deleted file mode 100644 index 0f9fbe9e9d5c..000000000000 --- a/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r4.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic - -DESCRIPTION="Software synthesizer capable of making a countless number of instruments" -HOMEPAGE="https://zynaddsubfx.sourceforge.net/" - -SRC_URI=" - https://downloads.sourceforge.net/zynaddsubfx/${P}.tar.bz2 - https://downloads.sourceforge.net/zynaddsubfx/zyn-fusion-ui-src-${PV}.tar.bz2 -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+alsa doc dssi jack lash portaudio" -REQUIRED_USE="|| ( alsa jack portaudio )" - -DEPEND=" - dev-libs/mxml:0 - media-libs/liblo - sci-libs/fftw:3.0 - sys-libs/zlib - virtual/opengl - alsa? ( media-libs/alsa-lib ) - doc? ( dev-texlive/texlive-fontutils ) - dssi? ( media-libs/dssi ) - jack? ( virtual/jack ) - lash? ( media-sound/lash ) - portaudio? ( media-libs/portaudio ) -" -RDEPEND=" - ${DEPEND} - media-fonts/roboto -" -BDEPEND=" - dev-lang/ruby:* - virtual/pkgconfig - doc? ( app-text/doxygen ) -" - -PATCHES=( - "${FILESDIR}"/${P}-docs.patch - "${FILESDIR}"/${P}-stdint.patch - "${FILESDIR}"/${P}-libzest_location.patch -) -ZYN_FUSION_UI_PATCHES=( - "${FILESDIR}"/zyn-fusion-ui-${PV}-cflags_ldflags.patch - "${FILESDIR}"/zyn-fusion-ui-${PV}-libzest_location.patch - "${FILESDIR}"/zyn-fusion-ui-${PV}-makefile_find.patch - "${FILESDIR}"/zyn-fusion-ui-${PV}-system_wide_location.patch -) - -DOCS=( AUTHORS.txt NEWS.txt README.adoc ) - -src_prepare() { - cmake_src_prepare - - if ! use dssi; then - sed -i -e '/pkg_search_module.*DSSI/s/^/#DONT/' src/CMakeLists.txt || die - fi - if ! use jack; then - sed -e '/pkg_check_modules.*JACK/s/^/#DONT/' -i {rtosc,src}/CMakeLists.txt || die - fi - if ! use lash; then - sed -i -e '/pkg_search_module.*LASH/s/^/#DONT/' src/CMakeLists.txt || die - fi - if ! use portaudio; then - sed -i -e '/pkg_check_modules.*PORTAUDIO/s/^/#DONT/' src/CMakeLists.txt || die - fi - - # FIXME upstream: sandbox error - sed -i -e '/add_subdirectory(bash-completion)/d' doc/CMakeLists.txt || die - - cd ../zyn-fusion-ui-src-${PV} - eapply "${ZYN_FUSION_UI_PATCHES[@]}" -} - -src_configure() { - append-cxxflags -std=c++11 - - local mycmakeargs=( - -DPluginLibDir=$(get_libdir) - -DGuiModule=zest - -DDefaultInput=jack - -DDefaultOutput=jack - $(cmake_use_find_package alsa Alsa) - $(cmake_use_find_package doc Doxygen) - ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile - use doc && cmake_src_compile doc - emake -C ../zyn-fusion-ui-src-${PV} -} - -src_install() { - use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) - cmake_src_install - - cd ../zyn-fusion-ui-src-${PV} - newbin zest zyn-fusion - insinto /usr/$(get_libdir)/${PN} - doins libzest.so - insinto /usr/share/${PN}/qml - doins -r src/mruby-zest/{example,qml}/*.qml - insinto /usr/share/${PN}/schema - doins src/osc-bridge/schema/test.json -} diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r5.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r5.ebuild new file mode 100644 index 000000000000..5a6403763d41 --- /dev/null +++ b/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r5.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic + +DESCRIPTION="Software synthesizer capable of making a countless number of instruments" +HOMEPAGE="https://zynaddsubfx.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/zynaddsubfx/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~ppc x86" +IUSE="+alsa doc dssi +fltk jack lash portaudio" +REQUIRED_USE="|| ( alsa jack portaudio )" + +DEPEND=" + dev-libs/mxml:0 + media-libs/liblo + sci-libs/fftw:3.0 + sys-libs/zlib + alsa? ( media-libs/alsa-lib ) + doc? ( dev-texlive/texlive-fontutils ) + dssi? ( media-libs/dssi ) + fltk? ( + x11-libs/fltk:1=[X(+)] + x11-libs/libX11 + x11-libs/libXpm + ) + jack? ( virtual/jack ) + lash? ( media-sound/lash ) + portaudio? ( media-libs/portaudio ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + dev-lang/ruby:* + virtual/pkgconfig + doc? ( app-text/doxygen ) +" + +PATCHES=( + "${FILESDIR}"/${P}-docs.patch + "${FILESDIR}"/${P}-stdint.patch + "${FILESDIR}"/${P}-fltk1.4.patch +) + +DOCS=( AUTHORS.txt NEWS.txt README.adoc ) + +src_prepare() { + cmake_src_prepare + + if ! use dssi; then + sed -i -e '/pkg_search_module.*DSSI/s/^/#DONT/' src/CMakeLists.txt || die + fi + if ! use jack; then + sed -e '/pkg_check_modules.*JACK/s/^/#DONT/' -i {rtosc,src}/CMakeLists.txt || die + fi + if ! use lash; then + sed -i -e '/pkg_search_module.*LASH/s/^/#DONT/' src/CMakeLists.txt || die + fi + if ! use portaudio; then + sed -i -e '/pkg_check_modules.*PORTAUDIO/s/^/#DONT/' src/CMakeLists.txt || die + fi + + # FIXME upstream: sandbox error + sed -i -e '/add_subdirectory(bash-completion)/d' doc/CMakeLists.txt || die +} + +src_configure() { + append-cxxflags -std=c++11 + + local mycmakeargs=( + -DPluginLibDir=$(get_libdir) + $(cmake_use_find_package alsa Alsa) + $(cmake_use_find_package doc Doxygen) + $(cmake_use_find_package fltk FLTK) + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + use doc && cmake_src_compile doc +} + +src_install() { + use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) + cmake_src_install + insinto /usr/share/${PN} + doins -r instruments/* +} diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r6.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r6.ebuild new file mode 100644 index 000000000000..0f9fbe9e9d5c --- /dev/null +++ b/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r6.ebuild @@ -0,0 +1,114 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic + +DESCRIPTION="Software synthesizer capable of making a countless number of instruments" +HOMEPAGE="https://zynaddsubfx.sourceforge.net/" + +SRC_URI=" + https://downloads.sourceforge.net/zynaddsubfx/${P}.tar.bz2 + https://downloads.sourceforge.net/zynaddsubfx/zyn-fusion-ui-src-${PV}.tar.bz2 +" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+alsa doc dssi jack lash portaudio" +REQUIRED_USE="|| ( alsa jack portaudio )" + +DEPEND=" + dev-libs/mxml:0 + media-libs/liblo + sci-libs/fftw:3.0 + sys-libs/zlib + virtual/opengl + alsa? ( media-libs/alsa-lib ) + doc? ( dev-texlive/texlive-fontutils ) + dssi? ( media-libs/dssi ) + jack? ( virtual/jack ) + lash? ( media-sound/lash ) + portaudio? ( media-libs/portaudio ) +" +RDEPEND=" + ${DEPEND} + media-fonts/roboto +" +BDEPEND=" + dev-lang/ruby:* + virtual/pkgconfig + doc? ( app-text/doxygen ) +" + +PATCHES=( + "${FILESDIR}"/${P}-docs.patch + "${FILESDIR}"/${P}-stdint.patch + "${FILESDIR}"/${P}-libzest_location.patch +) +ZYN_FUSION_UI_PATCHES=( + "${FILESDIR}"/zyn-fusion-ui-${PV}-cflags_ldflags.patch + "${FILESDIR}"/zyn-fusion-ui-${PV}-libzest_location.patch + "${FILESDIR}"/zyn-fusion-ui-${PV}-makefile_find.patch + "${FILESDIR}"/zyn-fusion-ui-${PV}-system_wide_location.patch +) + +DOCS=( AUTHORS.txt NEWS.txt README.adoc ) + +src_prepare() { + cmake_src_prepare + + if ! use dssi; then + sed -i -e '/pkg_search_module.*DSSI/s/^/#DONT/' src/CMakeLists.txt || die + fi + if ! use jack; then + sed -e '/pkg_check_modules.*JACK/s/^/#DONT/' -i {rtosc,src}/CMakeLists.txt || die + fi + if ! use lash; then + sed -i -e '/pkg_search_module.*LASH/s/^/#DONT/' src/CMakeLists.txt || die + fi + if ! use portaudio; then + sed -i -e '/pkg_check_modules.*PORTAUDIO/s/^/#DONT/' src/CMakeLists.txt || die + fi + + # FIXME upstream: sandbox error + sed -i -e '/add_subdirectory(bash-completion)/d' doc/CMakeLists.txt || die + + cd ../zyn-fusion-ui-src-${PV} + eapply "${ZYN_FUSION_UI_PATCHES[@]}" +} + +src_configure() { + append-cxxflags -std=c++11 + + local mycmakeargs=( + -DPluginLibDir=$(get_libdir) + -DGuiModule=zest + -DDefaultInput=jack + -DDefaultOutput=jack + $(cmake_use_find_package alsa Alsa) + $(cmake_use_find_package doc Doxygen) + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + use doc && cmake_src_compile doc + emake -C ../zyn-fusion-ui-src-${PV} +} + +src_install() { + use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) + cmake_src_install + + cd ../zyn-fusion-ui-src-${PV} + newbin zest zyn-fusion + insinto /usr/$(get_libdir)/${PN} + doins libzest.so + insinto /usr/share/${PN}/qml + doins -r src/mruby-zest/{example,qml}/*.qml + insinto /usr/share/${PN}/schema + doins src/osc-bridge/schema/test.json +} -- cgit v1.2.3-65-gdbad From ee7538e52d74deaba984104f48b2c2b0110702b1 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens <ionen@gentoo.org> Date: Thu, 26 Dec 2024 02:48:12 -0500 Subject: media-video/sonic-snap: add binding := to fltk & fix build with 1.4 1.4.x drops the case sensitivity compat symlinks by default and upstream strongly recommends to fix packages rather than re-enable them. := due to new soname Signed-off-by: Ionen Wolkens <ionen@gentoo.org> --- .../sonic-snap/files/sonic-snap-1.7-fltk1.4.patch | 6 ++ media-video/sonic-snap/sonic-snap-1.7-r1.ebuild | 65 -------------------- media-video/sonic-snap/sonic-snap-1.7-r2.ebuild | 69 ++++++++++++++++++++++ 3 files changed, 75 insertions(+), 65 deletions(-) create mode 100644 media-video/sonic-snap/files/sonic-snap-1.7-fltk1.4.patch delete mode 100644 media-video/sonic-snap/sonic-snap-1.7-r1.ebuild create mode 100644 media-video/sonic-snap/sonic-snap-1.7-r2.ebuild diff --git a/media-video/sonic-snap/files/sonic-snap-1.7-fltk1.4.patch b/media-video/sonic-snap/files/sonic-snap-1.7-fltk1.4.patch new file mode 100644 index 000000000000..f081d51aa426 --- /dev/null +++ b/media-video/sonic-snap/files/sonic-snap-1.7-fltk1.4.patch @@ -0,0 +1,6 @@ +Deprecated compatibility symlinks are removed. +--- a/sonic-snap-gui.cxx ++++ b/sonic-snap-gui.cxx +@@ -22 +22 @@ +-#include <FL/fl_file_chooser.H> ++#include <FL/Fl_File_Chooser.H> diff --git a/media-video/sonic-snap/sonic-snap-1.7-r1.ebuild b/media-video/sonic-snap/sonic-snap-1.7-r1.ebuild deleted file mode 100644 index 0d703945f44d..000000000000 --- a/media-video/sonic-snap/sonic-snap-1.7-r1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit linux-info toolchain-funcs - -DESCRIPTION="Webcam app for sn9c10x based camera controllers (with optional MPEG4 support)" -HOMEPAGE="https://www.stolk.org/sonic-snap/" -SRC_URI="https://www.stolk.org/${PN}/downloads/${P}.tar.gz" - -LICENSE="GPL-1" -SLOT="0" -KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="mpeg" - -DEPEND=" - sys-libs/zlib - x11-libs/fltk:1 - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXft - x11-libs/libXrender - mpeg? ( >=media-libs/libfame-0.9.1 ) -" -RDEPEND="${DEPEND}" - -CONFIG_CHECK="~USB_SN9C102" -ERROR_USB_SN9C102="Please make sure the SN9C1xx PC Camera Controller driver is \ -enabled, under V4L USB devices, as a module in your kernel." - -src_prepare() { - # fix bad assumptions - sed -i \ - -e "s|\$(HOME)/include|/usr/include|" \ - -e "s|\$(HOME)/lib|/usr/$(get_libdir)|" \ - -e "s|CFLAGS=|CFLAGS= ${CXXFLAGS} |" \ - -e "s|LFLAGS=|LFLAGS= ${LDFLAGS} |" \ - -e "s|g++-4.0 -O3 -o|$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} -o|" \ - -e "s/g++-4.0 -O3/$(tc-getCXX)/" \ - Makefile || die - - use mpeg || sed -i -e "s?USE_FAME=1?USE_FAME=0?g" Makefile || die - - default -} - -src_install() { - dodir /usr/bin - default - doman debian/sonic-snap.1 -} - -pkg_postinst() { - elog - elog "This driver is V4L v2 only, so V4L v1 apps will not work." - elog "Finally, only a few image sensors are supported, eg, PAS106B" - elog "so (check dmesg or /var/log/messages for USB device info when" - elog "you plug the cam in)." - elog - elog "Now try sonic-snap-gui /dev/videoX (where X is 0, 1 , etc)." - elog -} diff --git a/media-video/sonic-snap/sonic-snap-1.7-r2.ebuild b/media-video/sonic-snap/sonic-snap-1.7-r2.ebuild new file mode 100644 index 000000000000..117786115bce --- /dev/null +++ b/media-video/sonic-snap/sonic-snap-1.7-r2.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-info toolchain-funcs + +DESCRIPTION="Webcam app for sn9c10x based camera controllers (with optional MPEG4 support)" +HOMEPAGE="https://www.stolk.org/sonic-snap/" +SRC_URI="https://www.stolk.org/${PN}/downloads/${P}.tar.gz" + +LICENSE="GPL-1" +SLOT="0" +KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="mpeg" + +DEPEND=" + sys-libs/zlib + x11-libs/fltk:1= + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXext + x11-libs/libXft + x11-libs/libXrender + mpeg? ( >=media-libs/libfame-0.9.1 ) +" +RDEPEND="${DEPEND}" + +CONFIG_CHECK="~USB_SN9C102" +ERROR_USB_SN9C102="Please make sure the SN9C1xx PC Camera Controller driver is \ +enabled, under V4L USB devices, as a module in your kernel." + +PATCHES=( + "${FILESDIR}"/${P}-fltk1.4.patch +) + +src_prepare() { + # fix bad assumptions + sed -i \ + -e "s|\$(HOME)/include|/usr/include|" \ + -e "s|\$(HOME)/lib|/usr/$(get_libdir)|" \ + -e "s|CFLAGS=|CFLAGS= ${CXXFLAGS} |" \ + -e "s|LFLAGS=|LFLAGS= ${LDFLAGS} |" \ + -e "s|g++-4.0 -O3 -o|$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} -o|" \ + -e "s/g++-4.0 -O3/$(tc-getCXX)/" \ + Makefile || die + + use mpeg || sed -i -e "s?USE_FAME=1?USE_FAME=0?g" Makefile || die + + default +} + +src_install() { + dodir /usr/bin + default + doman debian/sonic-snap.1 +} + +pkg_postinst() { + elog + elog "This driver is V4L v2 only, so V4L v1 apps will not work." + elog "Finally, only a few image sensors are supported, eg, PAS106B" + elog "so (check dmesg or /var/log/messages for USB device info when" + elog "you plug the cam in)." + elog + elog "Now try sonic-snap-gui /dev/videoX (where X is 0, 1 , etc)." + elog +} -- cgit v1.2.3-65-gdbad From dffbde0633262541c48a857f6c0d1345e84cb5ef Mon Sep 17 00:00:00 2001 From: Ionen Wolkens <ionen@gentoo.org> Date: Thu, 26 Dec 2024 01:26:59 -0500 Subject: net-misc/tigervnc: add upper <fltk-1.4 bound for now Fails to build. Meant to fix it, but seen a comment by upstream saying that the build failure may as well be a good thing given it's incompatible with fltk-1.4 implying it likely has other issues. Also add binding operator given gained a subslot & soname changed, not that it matters with the upper bound. Skipping upper bound from 9999, given upstream is already aware I'd imagine it'll be fixed in the near future. Signed-off-by: Ionen Wolkens <ionen@gentoo.org> --- net-misc/tigervnc/tigervnc-1.14.1-r2.ebuild | 236 --------------------------- net-misc/tigervnc/tigervnc-1.14.1-r3.ebuild | 237 ++++++++++++++++++++++++++++ net-misc/tigervnc/tigervnc-9999.ebuild | 2 +- 3 files changed, 238 insertions(+), 237 deletions(-) delete mode 100644 net-misc/tigervnc/tigervnc-1.14.1-r2.ebuild create mode 100644 net-misc/tigervnc/tigervnc-1.14.1-r3.ebuild diff --git a/net-misc/tigervnc/tigervnc-1.14.1-r2.ebuild b/net-misc/tigervnc/tigervnc-1.14.1-r2.ebuild deleted file mode 100644 index d935ad0c303f..000000000000 --- a/net-misc/tigervnc/tigervnc-1.14.1-r2.ebuild +++ /dev/null @@ -1,236 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CMAKE_IN_SOURCE_BUILD=1 -inherit autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg - -XSERVER_VERSION="21.1.14" -XSERVER_PATCH_VERSION="21" - -DESCRIPTION="Remote desktop viewer display system" -HOMEPAGE="https://tigervnc.org" -SRC_URI="server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz )" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/" -else - SRC_URI+=" https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="dri3 +drm gnutls java nls +opengl +server +viewer xinerama" -REQUIRED_USE=" - dri3? ( drm ) - java? ( viewer ) - opengl? ( server ) - || ( server viewer ) -" - -# TODO: sys-libs/libselinux -COMMON_DEPEND=" - dev-libs/gmp:= - dev-libs/nettle:= - media-libs/libjpeg-turbo:= - sys-libs/zlib:= - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrandr - x11-libs/pixman - gnutls? ( net-libs/gnutls:= ) - nls? ( virtual/libiconv ) - server? ( - dev-libs/openssl:0= - sys-libs/pam - x11-libs/libXau - x11-libs/libxcvt - x11-libs/libXdamage - x11-libs/libXdmcp - x11-libs/libXfixes - x11-libs/libXfont2 - x11-libs/libXtst - x11-libs/pixman - x11-apps/xauth - x11-apps/xinit - x11-apps/xkbcomp - x11-apps/xsetroot - x11-misc/xkeyboard-config - dri3? ( - media-libs/mesa[opengl] - x11-libs/libxshmfence - ) - opengl? ( media-libs/libglvnd[X] ) - !net-misc/turbovnc[server] - ) - viewer? ( - media-video/ffmpeg:= - x11-libs/fltk:1 - x11-libs/libXi - x11-libs/libXrender - !net-misc/turbovnc[viewer] - ) -" -RDEPEND="${COMMON_DEPEND} - java? ( >=virtual/jre-1.8:* ) - server? ( dev-lang/perl ) -" -DEPEND="${COMMON_DEPEND} - java? ( >=virtual/jdk-1.8:* ) - drm? ( x11-libs/libdrm ) - server? ( - media-fonts/font-util - x11-base/xorg-proto - x11-libs/libXi - x11-libs/libxkbfile - x11-libs/libXrender - x11-libs/xtrans - x11-misc/util-macros - opengl? ( media-libs/mesa ) - ) -" -BDEPEND=" - virtual/pkgconfig - nls? ( sys-devel/gettext ) -" - -PATCHES=( - # Restore Java viewer - "${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch - "${FILESDIR}"/${PN}-1.14.0-xsession-path.patch - "${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch - "${FILESDIR}"/${PN}-1.14.1-pam.patch -) - -src_unpack() { - if [[ ${PV} == *9999 ]]; then - git-r3_src_unpack - use server && unpack xorg-server-${XSERVER_VERSION}.tar.xz - else - default - fi -} - -src_prepare() { - if use server; then - cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die - fi - - cmake_src_prepare - - if use server; then - cd unix/xserver || die - eapply ../xserver${XSERVER_PATCH_VERSION}.patch - eautoreconf - sed -i '/strcmp.*-fakescreenfps/,/^ \}/d' os/utils.c || die - - if use drm; then - cd "${WORKDIR}" && \ - sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die - fi - fi -} - -src_configure() { - if use arm || use hppa; then - append-flags "-fPIC" - fi - - local mycmakeargs=( - -DENABLE_GNUTLS=$(usex gnutls) - -DENABLE_NLS=$(usex nls) - -DBUILD_JAVA=$(usex java) - -DBUILD_SERVER=$(usex server) - -DBUILD_VIEWER=$(usex viewer) - ) - - cmake_src_configure - - if use server; then - cd unix/xserver || die - econf \ - $(use_enable opengl glx) \ - $(use_enable drm libdrm) \ - --disable-config-hal \ - --disable-config-udev \ - --disable-devel-docs \ - --disable-dri \ - $(use_enable dri3) \ - --disable-glamor \ - --disable-kdrive \ - --disable-libunwind \ - --disable-linux-acpi \ - --disable-record \ - --disable-selective-werror \ - --disable-static \ - --disable-unit-tests \ - --disable-xephyr \ - $(use_enable xinerama) \ - --disable-xnest \ - --disable-xorg \ - --disable-xvfb \ - --disable-xwin \ - --enable-dri2 \ - --with-pic \ - --without-dtrace \ - --with-sha1=libcrypto - fi -} - -src_compile() { - cmake_src_compile - - if use server; then - # deps of the vnc module and the module itself - local d subdirs=( - fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render - damageext miext Xi xkb composite dix mi os present hw/vnc - ) - for d in "${subdirs[@]}"; do - emake -C unix/xserver/"${d}" - done - fi -} - -src_install() { - cmake_src_install - - if use server; then - emake -C unix/xserver/hw/vnc DESTDIR="${D}" install - rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die - - newconfd "${FILESDIR}"/${PN}-1.14.0.confd ${PN} - newinitd "${FILESDIR}"/${PN}-1.14.0.initd ${PN} - - systemd_douserunit unix/vncserver/vncserver@.service - - # install vncserver to /usr/bin too, see bug #836620 - dosym -r /usr/libexec/vncserver /usr/bin/vncserver - fi -} - -pkg_postinst() { - xdg_pkg_postinst - - use server && [[ -n ${REPLACING_VERSIONS} ]] && ver_test "${REPLACING_VERSIONS}" -lt 1.13.1-r3 && { - elog 'OpenRC users: please migrate to one service per display as documented here:' - elog 'https://wiki.gentoo.org/wiki/TigerVNC#Migrating_from_1.13.1-r2_or_lower:' - elog - } - - use server && { - elog 'PLEASE NOTE:' - elog ' The default config directory is now ${XDG_CONFIG_HOME}/tigervnc or' - elog ' ~/.config/tigervnc instead of ~/.vnc' - elog - } - - local OPTIONAL_DM="gnome-base/gdm x11-misc/lightdm x11-misc/sddm x11-misc/slim" - use server && \ - optfeature "keeping track of the xorg-server module" net-misc/tigervnc-xorg-module && \ - optfeature_header "Install any additional display manager package:" && \ - optfeature "proper session support" ${OPTIONAL_DM} -} diff --git a/net-misc/tigervnc/tigervnc-1.14.1-r3.ebuild b/net-misc/tigervnc/tigervnc-1.14.1-r3.ebuild new file mode 100644 index 000000000000..8268a5a44c3a --- /dev/null +++ b/net-misc/tigervnc/tigervnc-1.14.1-r3.ebuild @@ -0,0 +1,237 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CMAKE_IN_SOURCE_BUILD=1 +inherit autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg + +XSERVER_VERSION="21.1.14" +XSERVER_PATCH_VERSION="21" + +DESCRIPTION="Remote desktop viewer display system" +HOMEPAGE="https://tigervnc.org" +SRC_URI="server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz )" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/" +else + SRC_URI+=" https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="dri3 +drm gnutls java nls +opengl +server +viewer xinerama" +REQUIRED_USE=" + dri3? ( drm ) + java? ( viewer ) + opengl? ( server ) + || ( server viewer ) +" + +# TODO: sys-libs/libselinux +# <fltk-1.4: https://github.com/TigerVNC/tigervnc/pull/1887#issuecomment-2545662546 +COMMON_DEPEND=" + dev-libs/gmp:= + dev-libs/nettle:= + media-libs/libjpeg-turbo:= + sys-libs/zlib:= + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXrandr + x11-libs/pixman + gnutls? ( net-libs/gnutls:= ) + nls? ( virtual/libiconv ) + server? ( + dev-libs/openssl:0= + sys-libs/pam + x11-libs/libXau + x11-libs/libxcvt + x11-libs/libXdamage + x11-libs/libXdmcp + x11-libs/libXfixes + x11-libs/libXfont2 + x11-libs/libXtst + x11-libs/pixman + x11-apps/xauth + x11-apps/xinit + x11-apps/xkbcomp + x11-apps/xsetroot + x11-misc/xkeyboard-config + dri3? ( + media-libs/mesa[opengl] + x11-libs/libxshmfence + ) + opengl? ( media-libs/libglvnd[X] ) + !net-misc/turbovnc[server] + ) + viewer? ( + media-video/ffmpeg:= + <x11-libs/fltk-1.4:1= + x11-libs/libXi + x11-libs/libXrender + !net-misc/turbovnc[viewer] + ) +" +RDEPEND="${COMMON_DEPEND} + java? ( >=virtual/jre-1.8:* ) + server? ( dev-lang/perl ) +" +DEPEND="${COMMON_DEPEND} + java? ( >=virtual/jdk-1.8:* ) + drm? ( x11-libs/libdrm ) + server? ( + media-fonts/font-util + x11-base/xorg-proto + x11-libs/libXi + x11-libs/libxkbfile + x11-libs/libXrender + x11-libs/xtrans + x11-misc/util-macros + opengl? ( media-libs/mesa ) + ) +" +BDEPEND=" + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +PATCHES=( + # Restore Java viewer + "${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch + "${FILESDIR}"/${PN}-1.14.0-xsession-path.patch + "${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch + "${FILESDIR}"/${PN}-1.14.1-pam.patch +) + +src_unpack() { + if [[ ${PV} == *9999 ]]; then + git-r3_src_unpack + use server && unpack xorg-server-${XSERVER_VERSION}.tar.xz + else + default + fi +} + +src_prepare() { + if use server; then + cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die + fi + + cmake_src_prepare + + if use server; then + cd unix/xserver || die + eapply ../xserver${XSERVER_PATCH_VERSION}.patch + eautoreconf + sed -i '/strcmp.*-fakescreenfps/,/^ \}/d' os/utils.c || die + + if use drm; then + cd "${WORKDIR}" && \ + sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die + fi + fi +} + +src_configure() { + if use arm || use hppa; then + append-flags "-fPIC" + fi + + local mycmakeargs=( + -DENABLE_GNUTLS=$(usex gnutls) + -DENABLE_NLS=$(usex nls) + -DBUILD_JAVA=$(usex java) + -DBUILD_SERVER=$(usex server) + -DBUILD_VIEWER=$(usex viewer) + ) + + cmake_src_configure + + if use server; then + cd unix/xserver || die + econf \ + $(use_enable opengl glx) \ + $(use_enable drm libdrm) \ + --disable-config-hal \ + --disable-config-udev \ + --disable-devel-docs \ + --disable-dri \ + $(use_enable dri3) \ + --disable-glamor \ + --disable-kdrive \ + --disable-libunwind \ + --disable-linux-acpi \ + --disable-record \ + --disable-selective-werror \ + --disable-static \ + --disable-unit-tests \ + --disable-xephyr \ + $(use_enable xinerama) \ + --disable-xnest \ + --disable-xorg \ + --disable-xvfb \ + --disable-xwin \ + --enable-dri2 \ + --with-pic \ + --without-dtrace \ + --with-sha1=libcrypto + fi +} + +src_compile() { + cmake_src_compile + + if use server; then + # deps of the vnc module and the module itself + local d subdirs=( + fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render + damageext miext Xi xkb composite dix mi os present hw/vnc + ) + for d in "${subdirs[@]}"; do + emake -C unix/xserver/"${d}" + done + fi +} + +src_install() { + cmake_src_install + + if use server; then + emake -C unix/xserver/hw/vnc DESTDIR="${D}" install + rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die + + newconfd "${FILESDIR}"/${PN}-1.14.0.confd ${PN} + newinitd "${FILESDIR}"/${PN}-1.14.0.initd ${PN} + + systemd_douserunit unix/vncserver/vncserver@.service + + # install vncserver to /usr/bin too, see bug #836620 + dosym -r /usr/libexec/vncserver /usr/bin/vncserver + fi +} + +pkg_postinst() { + xdg_pkg_postinst + + use server && [[ -n ${REPLACING_VERSIONS} ]] && ver_test "${REPLACING_VERSIONS}" -lt 1.13.1-r3 && { + elog 'OpenRC users: please migrate to one service per display as documented here:' + elog 'https://wiki.gentoo.org/wiki/TigerVNC#Migrating_from_1.13.1-r2_or_lower:' + elog + } + + use server && { + elog 'PLEASE NOTE:' + elog ' The default config directory is now ${XDG_CONFIG_HOME}/tigervnc or' + elog ' ~/.config/tigervnc instead of ~/.vnc' + elog + } + + local OPTIONAL_DM="gnome-base/gdm x11-misc/lightdm x11-misc/sddm x11-misc/slim" + use server && \ + optfeature "keeping track of the xorg-server module" net-misc/tigervnc-xorg-module && \ + optfeature_header "Install any additional display manager package:" && \ + optfeature "proper session support" ${OPTIONAL_DM} +} diff --git a/net-misc/tigervnc/tigervnc-9999.ebuild b/net-misc/tigervnc/tigervnc-9999.ebuild index 0569447b5b6c..e6b48ddae8b5 100644 --- a/net-misc/tigervnc/tigervnc-9999.ebuild +++ b/net-misc/tigervnc/tigervnc-9999.ebuild @@ -68,7 +68,7 @@ COMMON_DEPEND=" ) viewer? ( media-video/ffmpeg:= - x11-libs/fltk:1 + x11-libs/fltk:1= x11-libs/libXi x11-libs/libXrender !net-misc/turbovnc[viewer] -- cgit v1.2.3-65-gdbad From db2d4b54864b3f8cd55ffcd1044b0411667b4f8b Mon Sep 17 00:00:00 2001 From: Ionen Wolkens <ionen@gentoo.org> Date: Thu, 26 Dec 2024 02:52:18 -0500 Subject: net-p2p/ed2k_hash: add binding := to fltk comment, soname changed Have not looked at what's going on here, but update in case this is eventually restored. Signed-off-by: Ionen Wolkens <ionen@gentoo.org> --- net-p2p/ed2k_hash/ed2k_hash-0.4.0-r3.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net-p2p/ed2k_hash/ed2k_hash-0.4.0-r3.ebuild b/net-p2p/ed2k_hash/ed2k_hash-0.4.0-r3.ebuild index d4afe5bd484f..019bcb9aec30 100644 --- a/net-p2p/ed2k_hash/ed2k_hash-0.4.0-r3.ebuild +++ b/net-p2p/ed2k_hash/ed2k_hash-0.4.0-r3.ebuild @@ -16,7 +16,8 @@ IUSE="" # fltk support is broken, bug #359643 RESTRICT="mirror" -#DEPEND="fltk? ( x11-libs/fltk:1 )" +#DEPEND="fltk? ( x11-libs/fltk:1= )" +#RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/ed2k_64bit.patch" -- cgit v1.2.3-65-gdbad From 7ffe4e7cd0e9753107c32b54b25360f4cbc23006 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens <ionen@gentoo.org> Date: Thu, 26 Dec 2024 03:09:41 -0500 Subject: net-wireless/limesuite: add binding := to fltk, soname changed For what it's worth anyway, ebuild appears broken for other reasons at the moment (not planning to look into it myself, one *could* just remove the offending `rm` line but issue *may* be that the GUI is getting disabled for some reason and then it skips Desktop files). Skipping the revbump given a rebuild would likely fail anyway. Bug: https://bugs.gentoo.org/922785 Signed-off-by: Ionen Wolkens <ionen@gentoo.org> --- net-wireless/limesuite/limesuite-23.11.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net-wireless/limesuite/limesuite-23.11.0.ebuild b/net-wireless/limesuite/limesuite-23.11.0.ebuild index 5dc765b3cd1a..4b4cae7cffd2 100644 --- a/net-wireless/limesuite/limesuite-23.11.0.ebuild +++ b/net-wireless/limesuite/limesuite-23.11.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,7 +16,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" DEPEND=" - x11-libs/fltk:1 + x11-libs/fltk:1= x11-libs/wxGTK:${WX_GTK_VER} net-wireless/soapysdr:= virtual/opengl -- cgit v1.2.3-65-gdbad From 943cd3f41e0d6078aef169911f579d03b95fab8b Mon Sep 17 00:00:00 2001 From: Ionen Wolkens <ionen@gentoo.org> Date: Thu, 26 Dec 2024 03:22:19 -0500 Subject: net-wireless/wepdecrypt: add binding := to fltk, soname changed Signed-off-by: Ionen Wolkens <ionen@gentoo.org> --- net-wireless/wepdecrypt/wepdecrypt-0.8-r2.ebuild | 47 ------------------------ net-wireless/wepdecrypt/wepdecrypt-0.8-r3.ebuild | 47 ++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 47 deletions(-) delete mode 100644 net-wireless/wepdecrypt/wepdecrypt-0.8-r2.ebuild create mode 100644 net-wireless/wepdecrypt/wepdecrypt-0.8-r3.ebuild diff --git a/net-wireless/wepdecrypt/wepdecrypt-0.8-r2.ebuild b/net-wireless/wepdecrypt/wepdecrypt-0.8-r2.ebuild deleted file mode 100644 index 33ea4d37940a..000000000000 --- a/net-wireless/wepdecrypt/wepdecrypt-0.8-r2.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Enhanced version of WepAttack a tool for breaking 802.11 WEP keys" -HOMEPAGE="http://wepdecrypt.sourceforge.net/" -SRC_URI="https://downloads.sourceforge.net/wepdecrypt/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="X" - -RDEPEND=" - dev-libs/openssl:= - net-libs/libpcap - sys-libs/zlib - X? ( x11-libs/fltk:1 )" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-build.patch - "${FILESDIR}"/${P}-fltk.patch - "${FILESDIR}"/${P}-buffer.patch # bug#340148. - "${FILESDIR}"/${P}-dyn.patch - "${FILESDIR}"/${P}-fno-common.patch -) - -src_prepare() { - default - - sed -i \ - -e 's/make/$(MAKE)/g' \ - -e 's/wepdecrypt-$(VERSION)/${PF}/g' Makefile || die -} - -src_configure() { - econf \ - $(use X || echo --disable-gui) \ - --infodir=/usr/share/doc/${PF} -} - -src_install() { - default - docompress -x /usr/share/man/man1 -} diff --git a/net-wireless/wepdecrypt/wepdecrypt-0.8-r3.ebuild b/net-wireless/wepdecrypt/wepdecrypt-0.8-r3.ebuild new file mode 100644 index 000000000000..65a7d3c7e449 --- /dev/null +++ b/net-wireless/wepdecrypt/wepdecrypt-0.8-r3.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Enhanced version of WepAttack a tool for breaking 802.11 WEP keys" +HOMEPAGE="http://wepdecrypt.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/wepdecrypt/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="X" + +RDEPEND=" + dev-libs/openssl:= + net-libs/libpcap + sys-libs/zlib + X? ( x11-libs/fltk:1= )" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-build.patch + "${FILESDIR}"/${P}-fltk.patch + "${FILESDIR}"/${P}-buffer.patch # bug#340148. + "${FILESDIR}"/${P}-dyn.patch + "${FILESDIR}"/${P}-fno-common.patch +) + +src_prepare() { + default + + sed -i \ + -e 's/make/$(MAKE)/g' \ + -e 's/wepdecrypt-$(VERSION)/${PF}/g' Makefile || die +} + +src_configure() { + econf \ + $(use X || echo --disable-gui) \ + --infodir=/usr/share/doc/${PF} +} + +src_install() { + default + docompress -x /usr/share/man/man1 +} -- cgit v1.2.3-65-gdbad From de9ecbda077d0cd433039e2b900b7e85fff35ddb Mon Sep 17 00:00:00 2001 From: Ionen Wolkens <ionen@gentoo.org> Date: Thu, 26 Dec 2024 03:24:57 -0500 Subject: sci-biology/seaview: add binding := to fltk, soname changed Also update [xft] due to the USE being dropped in fltk-1.4 Signed-off-by: Ionen Wolkens <ionen@gentoo.org> --- sci-biology/seaview/seaview-4.6-r1.ebuild | 82 ------------------------------- sci-biology/seaview/seaview-4.6-r2.ebuild | 82 +++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 82 deletions(-) delete mode 100644 sci-biology/seaview/seaview-4.6-r1.ebuild create mode 100644 sci-biology/seaview/seaview-4.6-r2.ebuild diff --git a/sci-biology/seaview/seaview-4.6-r1.ebuild b/sci-biology/seaview/seaview-4.6-r1.ebuild deleted file mode 100644 index 469f88728120..000000000000 --- a/sci-biology/seaview/seaview-4.6-r1.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop toolchain-funcs - -DESCRIPTION="A graphical multiple sequence alignment editor" -HOMEPAGE="http://pbil.univ-lyon1.fr/software/seaview.html" -SRC_URI="ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/archive/${PN}_${PV}.tar.gz" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+xft" - -RDEPEND=" - sci-biology/clustalw:2 - sci-biology/phyml - || ( - sci-libs/libmuscle - sci-biology/muscle - ) - sys-libs/zlib - x11-libs/fltk:1[xft?] - x11-libs/libX11 - xft? ( x11-libs/libXft )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -S="${WORKDIR}/${PN}" -PATCHES=( - "${FILESDIR}"/${PN}-4.6-fno-common.patch - "${FILESDIR}"/${PN}-4.6-Wreserved-user-defined-literal.patch -) - -src_prepare() { - default - - # respect CXXFLAGS (package uses them as CFLAGS) - sed \ - -e "s:^CC.*:CC = $(tc-getCC):" \ - -e "s:^CXX.*:CXX = $(tc-getCXX):" \ - -e "s:\$(OPT):${CXXFLAGS}:" \ - -e "s:^OPT:#OPT:" \ - -e "s:^FLTK = .*$:FLTK = ${EPREFIX}/usr/include/fltk-1:" \ - -e "s:^#IFLTK .*:IFLTK = $(fltk-config --use-images --cflags):" \ - -e "s:^#LFLTK .*:LFLTK = $(fltk-config --use-images --ldflags):" \ - -e "s:^USE_XFT:#USE_XFT:" \ - -e "s:^#HELPFILE:HELPFILE:" \ - -e "s:/usr/share/doc/seaview/seaview.htm:${EPREFIX}/usr/share/seaview/seaview.htm:" \ - -e "s:^#PHYMLNAME:PHYMLNAME:" \ - -e 's:-lXinerama::g' \ - -e 's:-lpng::g' \ - -e 's:-ljpeg::g' \ - -e 's:-lfontconfig::g' \ - -i Makefile || die "sed failed while editing Makefile" - - if use xft; then - sed \ - -e "s:^#USE_XFT .*:USE_XFT = -DUSE_XFT $($(tc-getPKG_CONFIG) --cflags xft):" \ - -e "s:-lXft:$($(tc-getPKG_CONFIG) --libs xft):" \ - -i Makefile || die "sed failed while editing Makefile to enable xft" - else - sed -i -e "s:-lXft::" Makefile || die - fi -} - -src_install() { - dobin seaview - - # /usr/share/seaview/seaview.html is hardcoded in the binary, see Makefile - insinto /usr/share/seaview - doins example.nxs seaview.html - - insinto /usr/share/seaview/images - doins seaview.xpm - - make_desktop_entry seaview Seaview - - doman seaview.1 -} diff --git a/sci-biology/seaview/seaview-4.6-r2.ebuild b/sci-biology/seaview/seaview-4.6-r2.ebuild new file mode 100644 index 000000000000..d02cb1b027e6 --- /dev/null +++ b/sci-biology/seaview/seaview-4.6-r2.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop toolchain-funcs + +DESCRIPTION="A graphical multiple sequence alignment editor" +HOMEPAGE="http://pbil.univ-lyon1.fr/software/seaview.html" +SRC_URI="ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/archive/${PN}_${PV}.tar.gz" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+xft" + +RDEPEND=" + sci-biology/clustalw:2 + sci-biology/phyml + || ( + sci-libs/libmuscle + sci-biology/muscle + ) + sys-libs/zlib + x11-libs/fltk:1=[xft(+)?] + x11-libs/libX11 + xft? ( x11-libs/libXft )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}/${PN}" +PATCHES=( + "${FILESDIR}"/${PN}-4.6-fno-common.patch + "${FILESDIR}"/${PN}-4.6-Wreserved-user-defined-literal.patch +) + +src_prepare() { + default + + # respect CXXFLAGS (package uses them as CFLAGS) + sed \ + -e "s:^CC.*:CC = $(tc-getCC):" \ + -e "s:^CXX.*:CXX = $(tc-getCXX):" \ + -e "s:\$(OPT):${CXXFLAGS}:" \ + -e "s:^OPT:#OPT:" \ + -e "s:^FLTK = .*$:FLTK = ${EPREFIX}/usr/include/fltk-1:" \ + -e "s:^#IFLTK .*:IFLTK = $(fltk-config --use-images --cflags):" \ + -e "s:^#LFLTK .*:LFLTK = $(fltk-config --use-images --ldflags):" \ + -e "s:^USE_XFT:#USE_XFT:" \ + -e "s:^#HELPFILE:HELPFILE:" \ + -e "s:/usr/share/doc/seaview/seaview.htm:${EPREFIX}/usr/share/seaview/seaview.htm:" \ + -e "s:^#PHYMLNAME:PHYMLNAME:" \ + -e 's:-lXinerama::g' \ + -e 's:-lpng::g' \ + -e 's:-ljpeg::g' \ + -e 's:-lfontconfig::g' \ + -i Makefile || die "sed failed while editing Makefile" + + if use xft; then + sed \ + -e "s:^#USE_XFT .*:USE_XFT = -DUSE_XFT $($(tc-getPKG_CONFIG) --cflags xft):" \ + -e "s:-lXft:$($(tc-getPKG_CONFIG) --libs xft):" \ + -i Makefile || die "sed failed while editing Makefile to enable xft" + else + sed -i -e "s:-lXft::" Makefile || die + fi +} + +src_install() { + dobin seaview + + # /usr/share/seaview/seaview.html is hardcoded in the binary, see Makefile + insinto /usr/share/seaview + doins example.nxs seaview.html + + insinto /usr/share/seaview/images + doins seaview.xpm + + make_desktop_entry seaview Seaview + + doman seaview.1 +} -- cgit v1.2.3-65-gdbad From fc5107437cc612cada0a3222a250d19375f11ea0 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens <ionen@gentoo.org> Date: Thu, 26 Dec 2024 03:41:42 -0500 Subject: sci-chemistry/vmd: add binding := to fltk, soname changed Also cleanup lower bound, 1.1 is extremely ancient. Untested with fltk-1.4 given have not bothered getting the fetch restricted distfile. If there's any issues, note that fixes are typically easy (often IWYU missing headers or misnamed headers that relied on compat symlinks) and should avoid a upper bound if possible. Signed-off-by: Ionen Wolkens <ionen@gentoo.org> --- sci-chemistry/vmd/vmd-1.9.4_alpha57-r1.ebuild | 263 ------------------------- sci-chemistry/vmd/vmd-1.9.4_alpha57-r2.ebuild | 267 ++++++++++++++++++++++++++ sci-chemistry/vmd/vmd-1.9.4_alpha57-r3.ebuild | 263 +++++++++++++++++++++++++ sci-chemistry/vmd/vmd-1.9.4_alpha57.ebuild | 267 -------------------------- 4 files changed, 530 insertions(+), 530 deletions(-) delete mode 100644 sci-chemistry/vmd/vmd-1.9.4_alpha57-r1.ebuild create mode 100644 sci-chemistry/vmd/vmd-1.9.4_alpha57-r2.ebuild create mode 100644 sci-chemistry/vmd/vmd-1.9.4_alpha57-r3.ebuild delete mode 100644 sci-chemistry/vmd/vmd-1.9.4_alpha57.ebuild diff --git a/sci-chemistry/vmd/vmd-1.9.4_alpha57-r1.ebuild b/sci-chemistry/vmd/vmd-1.9.4_alpha57-r1.ebuild deleted file mode 100644 index 18bdb88a4c0c..000000000000 --- a/sci-chemistry/vmd/vmd-1.9.4_alpha57-r1.ebuild +++ /dev/null @@ -1,263 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) - -inherit cuda desktop prefix python-single-r1 toolchain-funcs xdg - -DESCRIPTION="Visual Molecular Dynamics" -HOMEPAGE="http://www.ks.uiuc.edu/Research/vmd/" - -MY_PV="${PV/_alpha/a}" -MY_P="${PN}-${MY_PV}" -SRC_URI=" - ${MY_P}.src.tar.gz - fetch+https://dev.gentoo.org/~pacho/${PN}/${PN}-1.9.4_alpha57-gentoo-patches.tar.xz -" -S="${WORKDIR}/${MY_P}" -LICENSE="vmd" - -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" - -IUSE="cuda gromacs msms povray sqlite tachyon xinerama" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RESTRICT="fetch" - -CDEPEND="${PYTHON_DEPS} - $(python_gen_cond_dep ' - >=dev-python/numpy-2[${PYTHON_USEDEP}] - ') - >=dev-lang/tk-8.6.1:0= - dev-lang/perl - dev-libs/expat - sci-libs/netcdf:0= - virtual/opengl - >=x11-libs/fltk-1.1.10-r2:1 - x11-libs/libXft - x11-libs/libXi - cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1:= ) - gromacs? ( >=sci-chemistry/gromacs-5.0.4-r1:0=[tng] ) - sqlite? ( dev-db/sqlite:3= ) - tachyon? ( >=media-gfx/tachyon-0.99_beta6 ) - xinerama? ( x11-libs/libXinerama ) -" -DEPEND="${CDEPEND}" -BDEPEND=" - virtual/pkgconfig - dev-lang/swig -" -RDEPEND="${CDEPEND} - sci-biology/stride - sci-chemistry/chemical-mime-data - sci-chemistry/surf - x11-misc/xdg-utils - x11-terms/xterm - msms? ( sci-chemistry/msms-bin ) - povray? ( media-gfx/povray ) -" -VMD_DOWNLOAD="http://www.ks.uiuc.edu/Development/Download/download.cgi?PackageName=VMD" - -# Binary only plugin -QA_PREBUILT="usr/lib*/vmd/plugins/LINUX/tcl/intersurf/bin/intersurf.so" -QA_FLAGS_IGNORED_amd64=" usr/lib64/vmd/plugins/LINUX/tcl/volutil/volutil" -QA_FLAGS_IGNORED_x86=" usr/lib/vmd/plugins/LINUX/tcl/volutil/volutil" - -pkg_nofetch() { - elog "Please download ${MY_P}.src.tar.gz from" - elog "${VMD_DOWNLOAD}" - elog "after agreeing to the license." - elog "Place it into your DISTDIR directory." -} - -src_prepare() { - # Apply user patches from ${WORKDIR} to allow patching on patches - # subdir too - cd "${WORKDIR}" - default - - # https://www.ks.uiuc.edu/Research/vmd/mailing_list/vmd-l/32121.html - # https://www.ks.uiuc.edu/Research/vmd/mailing_list/vmd-l/32116.html - eapply "${WORKDIR}"/${PN}-patches/${PN}-1.9.4a51-gentoo-plugins.patch - - use cuda && cuda_sanitize - - # Prepare plugins - cd plugins || die - - sed '/^.SILENT/d' -i $(find -name Makefile) - - sed \ - -e "s:CC = gcc:CC = $(tc-getCC):" \ - -e "s:CXX = g++:CXX = $(tc-getCXX):" \ - -e "s:COPTO =.*\":COPTO = -fPIC -o \":" \ - -e "s:LOPTO = .*\":LOPTO = ${LDFLAGS} -fPIC -o \":" \ - -e "s:CCFLAGS =.*\":CCFLAGS = ${CFLAGS}\":" \ - -e "s:CXXFLAGS =.*\":CXXFLAGS = ${CXXFLAGS}\":" \ - -e "s:SHLD = gcc:SHLD = $(tc-getCC):" \ - -e "s:SHXXLD = g++:SHXXLD = $(tc-getCXX):" \ - -e "s:-ltcl8.5:-ltcl:" \ - -i Make-arch || die "Failed to set up plugins Makefile" - - sed \ - -e '/^AR /s:=:?=:g' \ - -e '/^RANLIB /s:=:?=:g' \ - -i ../plugins/*/Makefile || die - - tc-export AR RANLIB - - sed \ - -e "s:\$(CXXFLAGS)::g" \ - -i hesstrans/Makefile || die - - # prepare vmd itself - cd "${S}" || die - - eapply "${WORKDIR}"/${PN}-patches/${PN}-1.9.4a51-gentoo-paths.patch - - # https://www.ks.uiuc.edu/Research/vmd/mailing_list/vmd-l/32122.html - eapply "${WORKDIR}"/${PN}-patches/${PN}-1.9.4-tmpdir.patch - - # PREFIX - sed \ - -e "s:/usr/include/:${EPREFIX}/usr/include:g" \ - -i configure || die - - sed \ - -e "s:gentoo-bindir:${ED}/usr/bin:g" \ - -e "s:gentoo-libdir:${ED}/usr/$(get_libdir):g" \ - -e "s:gentoo-opengl-include:${EPREFIX}/usr/include/GL:g" \ - -e "s:gentoo-opengl-libs:${EPREFIX}/usr/$(get_libdir):g" \ - -e "s:gentoo-gcc:$(tc-getCC):g" \ - -e "s:gentoo-g++:$(tc-getCXX):g" \ - -e "s:gentoo-nvcc:${EPREFIX}/opt/cuda/bin/nvcc:g" \ - -e "s:gentoo-cflags:${CFLAGS}:g" \ - -e "s:gentoo-cxxflags:${CXXFLAGS}:g" \ - -e "s:gentoo-nvflags::g" \ - -e "s:gentoo-ldflags:${LDFLAGS}:g" \ - -e "s:gentoo-plugindir:${WORKDIR}/plugins:g" \ - -e "s:gentoo-fltk-include:$(fltk-config --includedir):g" \ - -e "s:gentoo-fltk-libs:$(dirname $(fltk-config --libs)) -Wl,-rpath,$(dirname $(fltk-config --libs)):g" \ - -e "s:gentoo-libtachyon-include:${EPREFIX}/usr/include/tachyon:g" \ - -e "s:gentoo-libtachyon-libs:${EPREFIX}/usr/$(get_libdir):g" \ - -e "s:gentoo-netcdf-include:${EPREFIX}/usr/include:g" \ - -e "s:gentoo-netcdf-libs:${EPREFIX}/usr/$(get_libdir):g" \ - -i configure || die - - if use cuda; then - sed \ - -e "s:gentoo-cuda-lib:${EPREFIX}/opt/cuda/$(get_libdir):g" \ - -e "/NVCCFLAGS/s:=:= ${NVCCFLAGS}:g" \ - -i configure src/Makefile || die - sed \ - -e '/compute_/d' \ - -i configure || die - sed \ - -e 's:-gencode .*code=sm_..::' \ - -i src/Makefile || die - fi - - sed \ - -e "s:LINUXPPC:LINUX:g" \ - -e "s:LINUXALPHA:LINUX:g" \ - -e "s:LINUXAMD64:LINUX:g" \ - -e "s:gentoo-stride:${EPREFIX}/usr/bin/stride:g" \ - -e "s:gentoo-surf:${EPREFIX}/usr/bin/surf:g" \ - -e "s:gentoo-tachyon:${EPREFIX}/usr/bin/tachyon:g" \ - -i "${S}"/bin/vmd.sh || die "failed setting up vmd wrapper script" - - EMAKEOPTS=( - TCLINC="-I${EPREFIX}/usr/include" - TCLLIB="-L${EPREFIX}/usr/$(get_libdir)" - NETCDFLIB="$($(tc-getPKG_CONFIG) --libs-only-L netcdf)${EPREFIX}/usr/$(get_libdir)/libnetcdf.so" - NETCDFINC="$($(tc-getPKG_CONFIG) --cflags-only-I netcdf)${EPREFIX}/usr/include" - NETCDFLDFLAGS="$($(tc-getPKG_CONFIG) --libs netcdf)" - NETCDFDYNAMIC=1 - EXPATINC="-I${EPREFIX}/usr/include" - EXPATLIB="$($(tc-getPKG_CONFIG) --libs expat)" - EXPATDYNAMIC=1 - ) - if use gromacs; then - EMAKEOPTS+=( - TNGLIB="$($(tc-getPKG_CONFIG) --libs libgromacs)" - TNGINC="-I${EPREFIX}/usr/include" - TNGDYNAMIC=1 - ) - fi - if use sqlite; then - EMAKEOPTS+=( - SQLITELIB="$($(tc-getPKG_CONFIG) --libs sqlite3)" - SQLITEINC="-I${EPREFIX}/usr/include" - SQLITEDYNAMIC=1 - ) - fi -} - -src_configure() { - local myconf="OPENGL OPENGLPBUFFER COLVARS FLTK TK TCL PTHREADS PYTHON IMD NETCDF NUMPY NOSILENT XINPUT" - rm -f configure.options && echo $myconf >> configure.options - - use cuda && myconf+=" CUDA" -# use mpi && myconf+=" MPI" - use tachyon && myconf+=" LIBTACHYON" - use xinerama && myconf+=" XINERAMA" - - export \ - PYTHON_INCLUDE_DIR="$(python_get_includedir)" \ - PYTHON_LIBRARY_DIR="$(python_get_library_path)" \ - PYTHON_LIBRARY="$(python_get_LIBS)" \ - NUMPY_INCLUDE_DIR="$(python_get_sitedir)/numpy/_core/include" \ - NUMPY_LIBRARY_DIR="$(python_get_sitedir)/numpy/_core/include" - - perl ./configure LINUX \ - ${myconf} || die -} - -src_compile() { - # build plugins - cd "${WORKDIR}"/plugins || die - - emake \ - ${EMAKEOPTS[@]} \ - LINUX - - # build vmd - cd "${S}"/src || die - emake -} - -src_install() { - # install plugins - cd "${WORKDIR}"/plugins || die - emake \ - PLUGINDIR="${ED}/usr/$(get_libdir)/${PN}/plugins" \ - distrib - - # install vmd - cd "${S}"/src || die - emake install - - # install docs - cd "${S}" || die - dodoc Announcement README doc/ig.pdf doc/ug.pdf - - # remove some of the things we don't want and need in - # /usr/lib - cd "${ED}"/usr/$(get_libdir)/vmd || die - rm -fr doc README Announcement LICENSE || \ - die "failed to clean up /usr/lib/vmd directory" - - # adjust path in vmd wrapper - sed \ - -e "s:${ED}::" -i "${ED}"/usr/bin/${PN} \ - -e "/^defaultvmddir/s:^.*$:defaultvmddir=\"${EPREFIX}/usr/$(get_libdir)/${PN}\":g" \ - || die "failed to set up vmd wrapper script" - - # install icon and generate desktop entry - insinto /usr/share/pixmaps - doins "${WORKDIR}"/vmd-patches/vmd.png - eprefixify "${WORKDIR}"/vmd-patches/vmd.desktop - domenu "${WORKDIR}"/vmd-patches/vmd.desktop -} diff --git a/sci-chemistry/vmd/vmd-1.9.4_alpha57-r2.ebuild b/sci-chemistry/vmd/vmd-1.9.4_alpha57-r2.ebuild new file mode 100644 index 000000000000..9addf38da980 --- /dev/null +++ b/sci-chemistry/vmd/vmd-1.9.4_alpha57-r2.ebuild @@ -0,0 +1,267 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{10..12} ) + +inherit cuda desktop prefix python-single-r1 toolchain-funcs xdg + +DESCRIPTION="Visual Molecular Dynamics" +HOMEPAGE="http://www.ks.uiuc.edu/Research/vmd/" + +MY_PV="${PV/_alpha/a}" +MY_P="${PN}-${MY_PV}" +SRC_URI=" + ${MY_P}.src.tar.gz + fetch+https://dev.gentoo.org/~pacho/${PN}/${PN}-1.9.4_alpha57-gentoo-patches.tar.xz +" +S="${WORKDIR}/${MY_P}" +LICENSE="vmd" + +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" + +IUSE="cuda gromacs msms povray sqlite tachyon xinerama" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RESTRICT="fetch" + +CDEPEND="${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + ') + >=dev-lang/tk-8.6.1:0= + dev-lang/perl + dev-libs/expat + sci-libs/netcdf:0= + virtual/opengl + x11-libs/fltk:1= + x11-libs/libXft + x11-libs/libXi + cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1:= ) + gromacs? ( >=sci-chemistry/gromacs-5.0.4-r1:0=[tng] ) + sqlite? ( dev-db/sqlite:3= ) + tachyon? ( >=media-gfx/tachyon-0.99_beta6 ) + xinerama? ( x11-libs/libXinerama ) +" +DEPEND="${CDEPEND}" +BDEPEND=" + virtual/pkgconfig + dev-lang/swig +" +RDEPEND="${CDEPEND} + sci-biology/stride + sci-chemistry/chemical-mime-data + sci-chemistry/surf + x11-misc/xdg-utils + x11-terms/xterm + msms? ( sci-chemistry/msms-bin ) + povray? ( media-gfx/povray ) +" +VMD_DOWNLOAD="http://www.ks.uiuc.edu/Development/Download/download.cgi?PackageName=VMD" + +# Binary only plugin +QA_PREBUILT="usr/lib*/vmd/plugins/LINUX/tcl/intersurf/bin/intersurf.so" +QA_FLAGS_IGNORED_amd64=" usr/lib64/vmd/plugins/LINUX/tcl/volutil/volutil" +QA_FLAGS_IGNORED_x86=" usr/lib/vmd/plugins/LINUX/tcl/volutil/volutil" + +pkg_nofetch() { + elog "Please download ${MY_P}.src.tar.gz from" + elog "${VMD_DOWNLOAD}" + elog "after agreeing to the license." + elog "Place it into your DISTDIR directory." +} + +src_prepare() { + # Apply user patches from ${WORKDIR} to allow patching on patches + # subdir too + cd "${WORKDIR}" + default + + # https://www.ks.uiuc.edu/Research/vmd/mailing_list/vmd-l/32121.html + # https://www.ks.uiuc.edu/Research/vmd/mailing_list/vmd-l/32116.html + eapply "${WORKDIR}"/${PN}-patches/${PN}-1.9.4a51-gentoo-plugins.patch + + use cuda && cuda_sanitize + + # Prepare plugins + cd plugins || die + + sed '/^.SILENT/d' -i $(find -name Makefile) + + sed \ + -e "s:CC = gcc:CC = $(tc-getCC):" \ + -e "s:CXX = g++:CXX = $(tc-getCXX):" \ + -e "s:COPTO =.*\":COPTO = -fPIC -o \":" \ + -e "s:LOPTO = .*\":LOPTO = ${LDFLAGS} -fPIC -o \":" \ + -e "s:CCFLAGS =.*\":CCFLAGS = ${CFLAGS}\":" \ + -e "s:CXXFLAGS =.*\":CXXFLAGS = ${CXXFLAGS}\":" \ + -e "s:SHLD = gcc:SHLD = $(tc-getCC) -shared:" \ + -e "s:SHXXLD = g++:SHXXLD = $(tc-getCXX) -shared:" \ + -e "s:-ltcl8.5:-ltcl:" \ + -i Make-arch || die "Failed to set up plugins Makefile" + + sed \ + -e '/^AR /s:=:?=:g' \ + -e '/^RANLIB /s:=:?=:g' \ + -i ../plugins/*/Makefile || die + + tc-export AR RANLIB + + sed \ + -e "s:\$(CXXFLAGS)::g" \ + -i hesstrans/Makefile || die + + # prepare vmd itself + cd "${S}" || die + + eapply "${WORKDIR}"/${PN}-patches/${PN}-1.9.4a51-gentoo-paths.patch + + # https://www.ks.uiuc.edu/Research/vmd/mailing_list/vmd-l/32122.html + eapply "${WORKDIR}"/${PN}-patches/${PN}-1.9.4-tmpdir.patch + + # PREFIX + sed \ + -e "s:/usr/include/:${EPREFIX}/usr/include:g" \ + -i configure || die + + sed \ + -e "s:gentoo-bindir:${ED}/usr/bin:g" \ + -e "s:gentoo-libdir:${ED}/usr/$(get_libdir):g" \ + -e "s:gentoo-opengl-include:${EPREFIX}/usr/include/GL:g" \ + -e "s:gentoo-opengl-libs:${EPREFIX}/usr/$(get_libdir):g" \ + -e "s:gentoo-gcc:$(tc-getCC):g" \ + -e "s:gentoo-g++:$(tc-getCXX):g" \ + -e "s:gentoo-nvcc:${EPREFIX}/opt/cuda/bin/nvcc:g" \ + -e "s:gentoo-cflags:${CFLAGS}:g" \ + -e "s:gentoo-cxxflags:${CXXFLAGS}:g" \ + -e "s:gentoo-nvflags::g" \ + -e "s:gentoo-ldflags:${LDFLAGS}:g" \ + -e "s:gentoo-plugindir:${WORKDIR}/plugins:g" \ + -e "s:gentoo-fltk-include:$(fltk-config --includedir):g" \ + -e "s:gentoo-fltk-libs:$(dirname $(fltk-config --libs)) -Wl,-rpath,$(dirname $(fltk-config --libs)):g" \ + -e "s:gentoo-libtachyon-include:${EPREFIX}/usr/include/tachyon:g" \ + -e "s:gentoo-libtachyon-libs:${EPREFIX}/usr/$(get_libdir):g" \ + -e "s:gentoo-netcdf-include:${EPREFIX}/usr/include:g" \ + -e "s:gentoo-netcdf-libs:${EPREFIX}/usr/$(get_libdir):g" \ + -i configure || die + + if use cuda; then + sed \ + -e "s:gentoo-cuda-lib:${EPREFIX}/opt/cuda/$(get_libdir):g" \ + -e "/NVCCFLAGS/s:=:= ${NVCCFLAGS}:g" \ + -i configure src/Makefile || die + sed \ + -e '/compute_/d' \ + -i configure || die + sed \ + -e 's:-gencode .*code=sm_..::' \ + -i src/Makefile || die + fi + + sed \ + -e "s:LINUXPPC:LINUX:g" \ + -e "s:LINUXALPHA:LINUX:g" \ + -e "s:LINUXAMD64:LINUX:g" \ + -e "s:gentoo-stride:${EPREFIX}/usr/bin/stride:g" \ + -e "s:gentoo-surf:${EPREFIX}/usr/bin/surf:g" \ + -e "s:gentoo-tachyon:${EPREFIX}/usr/bin/tachyon:g" \ + -i "${S}"/bin/vmd.sh || die "failed setting up vmd wrapper script" + + EMAKEOPTS=( + TCLINC="-I${EPREFIX}/usr/include" + TCLLIB="-L${EPREFIX}/usr/$(get_libdir)" + TCLLDFLAGS="-shared" + NETCDFLIB="$($(tc-getPKG_CONFIG) --libs-only-L netcdf)${EPREFIX}/usr/$(get_libdir)/libnetcdf.so" + NETCDFINC="$($(tc-getPKG_CONFIG) --cflags-only-I netcdf)${EPREFIX}/usr/include" + NETCDFLDFLAGS="$($(tc-getPKG_CONFIG) --libs netcdf)" + NETCDFDYNAMIC=1 + EXPATINC="-I${EPREFIX}/usr/include" + EXPATLIB="$($(tc-getPKG_CONFIG) --libs expat)" + EXPATLDFLAGS="-shared" + EXPATDYNAMIC=1 + ) + if use gromacs; then + EMAKEOPTS+=( + TNGLIB="$($(tc-getPKG_CONFIG) --libs libgromacs)" + TNGINC="-I${EPREFIX}/usr/include" + TNGLDFLAGS="-shared" + TNGDYNAMIC=1 + ) + fi + if use sqlite; then + EMAKEOPTS+=( + SQLITELIB="$($(tc-getPKG_CONFIG) --libs sqlite3)" + SQLITEINC="-I${EPREFIX}/usr/include" + SQLITELDFLAGS="-shared" + SQLITEDYNAMIC=1 + ) + fi +} + +src_configure() { + local myconf="OPENGL OPENGLPBUFFER COLVARS FLTK TK TCL PTHREADS PYTHON IMD NETCDF NUMPY NOSILENT XINPUT" + rm -f configure.options && echo $myconf >> configure.options + + use cuda && myconf+=" CUDA" +# use mpi && myconf+=" MPI" + use tachyon && myconf+=" LIBTACHYON" + use xinerama && myconf+=" XINERAMA" + + export \ + PYTHON_INCLUDE_DIR="$(python_get_includedir)" \ + PYTHON_LIBRARY_DIR="$(python_get_library_path)" \ + PYTHON_LIBRARY="$(python_get_LIBS)" \ + NUMPY_INCLUDE_DIR="$(python_get_sitedir)/numpy/core/include" \ + NUMPY_LIBRARY_DIR="$(python_get_sitedir)/numpy/core/include" + + perl ./configure LINUX \ + ${myconf} || die +} + +src_compile() { + # build plugins + cd "${WORKDIR}"/plugins || die + + emake \ + ${EMAKEOPTS[@]} \ + LINUX + + # build vmd + cd "${S}"/src || die + emake +} + +src_install() { + # install plugins + cd "${WORKDIR}"/plugins || die + emake \ + PLUGINDIR="${ED}/usr/$(get_libdir)/${PN}/plugins" \ + distrib + + # install vmd + cd "${S}"/src || die + emake install + + # install docs + cd "${S}" || die + dodoc Announcement README doc/ig.pdf doc/ug.pdf + + # remove some of the things we don't want and need in + # /usr/lib + cd "${ED}"/usr/$(get_libdir)/vmd || die + rm -fr doc README Announcement LICENSE || \ + die "failed to clean up /usr/lib/vmd directory" + + # adjust path in vmd wrapper + sed \ + -e "s:${ED}::" -i "${ED}"/usr/bin/${PN} \ + -e "/^defaultvmddir/s:^.*$:defaultvmddir=\"${EPREFIX}/usr/$(get_libdir)/${PN}\":g" \ + || die "failed to set up vmd wrapper script" + + # install icon and generate desktop entry + insinto /usr/share/pixmaps + doins "${WORKDIR}"/vmd-patches/vmd.png + eprefixify "${WORKDIR}"/vmd-patches/vmd.desktop + domenu "${WORKDIR}"/vmd-patches/vmd.desktop +} diff --git a/sci-chemistry/vmd/vmd-1.9.4_alpha57-r3.ebuild b/sci-chemistry/vmd/vmd-1.9.4_alpha57-r3.ebuild new file mode 100644 index 000000000000..cc5a157bf69a --- /dev/null +++ b/sci-chemistry/vmd/vmd-1.9.4_alpha57-r3.ebuild @@ -0,0 +1,263 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{10..12} ) + +inherit cuda desktop prefix python-single-r1 toolchain-funcs xdg + +DESCRIPTION="Visual Molecular Dynamics" +HOMEPAGE="http://www.ks.uiuc.edu/Research/vmd/" + +MY_PV="${PV/_alpha/a}" +MY_P="${PN}-${MY_PV}" +SRC_URI=" + ${MY_P}.src.tar.gz + fetch+https://dev.gentoo.org/~pacho/${PN}/${PN}-1.9.4_alpha57-gentoo-patches.tar.xz +" +S="${WORKDIR}/${MY_P}" +LICENSE="vmd" + +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" + +IUSE="cuda gromacs msms povray sqlite tachyon xinerama" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RESTRICT="fetch" + +CDEPEND="${PYTHON_DEPS} + $(python_gen_cond_dep ' + >=dev-python/numpy-2[${PYTHON_USEDEP}] + ') + >=dev-lang/tk-8.6.1:0= + dev-lang/perl + dev-libs/expat + sci-libs/netcdf:0= + virtual/opengl + x11-libs/fltk:1= + x11-libs/libXft + x11-libs/libXi + cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1:= ) + gromacs? ( >=sci-chemistry/gromacs-5.0.4-r1:0=[tng] ) + sqlite? ( dev-db/sqlite:3= ) + tachyon? ( >=media-gfx/tachyon-0.99_beta6 ) + xinerama? ( x11-libs/libXinerama ) +" +DEPEND="${CDEPEND}" +BDEPEND=" + virtual/pkgconfig + dev-lang/swig +" +RDEPEND="${CDEPEND} + sci-biology/stride + sci-chemistry/chemical-mime-data + sci-chemistry/surf + x11-misc/xdg-utils + x11-terms/xterm + msms? ( sci-chemistry/msms-bin ) + povray? ( media-gfx/povray ) +" +VMD_DOWNLOAD="http://www.ks.uiuc.edu/Development/Download/download.cgi?PackageName=VMD" + +# Binary only plugin +QA_PREBUILT="usr/lib*/vmd/plugins/LINUX/tcl/intersurf/bin/intersurf.so" +QA_FLAGS_IGNORED_amd64=" usr/lib64/vmd/plugins/LINUX/tcl/volutil/volutil" +QA_FLAGS_IGNORED_x86=" usr/lib/vmd/plugins/LINUX/tcl/volutil/volutil" + +pkg_nofetch() { + elog "Please download ${MY_P}.src.tar.gz from" + elog "${VMD_DOWNLOAD}" + elog "after agreeing to the license." + elog "Place it into your DISTDIR directory." +} + +src_prepare() { + # Apply user patches from ${WORKDIR} to allow patching on patches + # subdir too + cd "${WORKDIR}" + default + + # https://www.ks.uiuc.edu/Research/vmd/mailing_list/vmd-l/32121.html + # https://www.ks.uiuc.edu/Research/vmd/mailing_list/vmd-l/32116.html + eapply "${WORKDIR}"/${PN}-patches/${PN}-1.9.4a51-gentoo-plugins.patch + + use cuda && cuda_sanitize + + # Prepare plugins + cd plugins || die + + sed '/^.SILENT/d' -i $(find -name Makefile) + + sed \ + -e "s:CC = gcc:CC = $(tc-getCC):" \ + -e "s:CXX = g++:CXX = $(tc-getCXX):" \ + -e "s:COPTO =.*\":COPTO = -fPIC -o \":" \ + -e "s:LOPTO = .*\":LOPTO = ${LDFLAGS} -fPIC -o \":" \ + -e "s:CCFLAGS =.*\":CCFLAGS = ${CFLAGS}\":" \ + -e "s:CXXFLAGS =.*\":CXXFLAGS = ${CXXFLAGS}\":" \ + -e "s:SHLD = gcc:SHLD = $(tc-getCC):" \ + -e "s:SHXXLD = g++:SHXXLD = $(tc-getCXX):" \ + -e "s:-ltcl8.5:-ltcl:" \ + -i Make-arch || die "Failed to set up plugins Makefile" + + sed \ + -e '/^AR /s:=:?=:g' \ + -e '/^RANLIB /s:=:?=:g' \ + -i ../plugins/*/Makefile || die + + tc-export AR RANLIB + + sed \ + -e "s:\$(CXXFLAGS)::g" \ + -i hesstrans/Makefile || die + + # prepare vmd itself + cd "${S}" || die + + eapply "${WORKDIR}"/${PN}-patches/${PN}-1.9.4a51-gentoo-paths.patch + + # https://www.ks.uiuc.edu/Research/vmd/mailing_list/vmd-l/32122.html + eapply "${WORKDIR}"/${PN}-patches/${PN}-1.9.4-tmpdir.patch + + # PREFIX + sed \ + -e "s:/usr/include/:${EPREFIX}/usr/include:g" \ + -i configure || die + + sed \ + -e "s:gentoo-bindir:${ED}/usr/bin:g" \ + -e "s:gentoo-libdir:${ED}/usr/$(get_libdir):g" \ + -e "s:gentoo-opengl-include:${EPREFIX}/usr/include/GL:g" \ + -e "s:gentoo-opengl-libs:${EPREFIX}/usr/$(get_libdir):g" \ + -e "s:gentoo-gcc:$(tc-getCC):g" \ + -e "s:gentoo-g++:$(tc-getCXX):g" \ + -e "s:gentoo-nvcc:${EPREFIX}/opt/cuda/bin/nvcc:g" \ + -e "s:gentoo-cflags:${CFLAGS}:g" \ + -e "s:gentoo-cxxflags:${CXXFLAGS}:g" \ + -e "s:gentoo-nvflags::g" \ + -e "s:gentoo-ldflags:${LDFLAGS}:g" \ + -e "s:gentoo-plugindir:${WORKDIR}/plugins:g" \ + -e "s:gentoo-fltk-include:$(fltk-config --includedir):g" \ + -e "s:gentoo-fltk-libs:$(dirname $(fltk-config --libs)) -Wl,-rpath,$(dirname $(fltk-config --libs)):g" \ + -e "s:gentoo-libtachyon-include:${EPREFIX}/usr/include/tachyon:g" \ + -e "s:gentoo-libtachyon-libs:${EPREFIX}/usr/$(get_libdir):g" \ + -e "s:gentoo-netcdf-include:${EPREFIX}/usr/include:g" \ + -e "s:gentoo-netcdf-libs:${EPREFIX}/usr/$(get_libdir):g" \ + -i configure || die + + if use cuda; then + sed \ + -e "s:gentoo-cuda-lib:${EPREFIX}/opt/cuda/$(get_libdir):g" \ + -e "/NVCCFLAGS/s:=:= ${NVCCFLAGS}:g" \ + -i configure src/Makefile || die + sed \ + -e '/compute_/d' \ + -i configure || die + sed \ + -e 's:-gencode .*code=sm_..::' \ + -i src/Makefile || die + fi + + sed \ + -e "s:LINUXPPC:LINUX:g" \ + -e "s:LINUXALPHA:LINUX:g" \ + -e "s:LINUXAMD64:LINUX:g" \ + -e "s:gentoo-stride:${EPREFIX}/usr/bin/stride:g" \ + -e "s:gentoo-surf:${EPREFIX}/usr/bin/surf:g" \ + -e "s:gentoo-tachyon:${EPREFIX}/usr/bin/tachyon:g" \ + -i "${S}"/bin/vmd.sh || die "failed setting up vmd wrapper script" + + EMAKEOPTS=( + TCLINC="-I${EPREFIX}/usr/include" + TCLLIB="-L${EPREFIX}/usr/$(get_libdir)" + NETCDFLIB="$($(tc-getPKG_CONFIG) --libs-only-L netcdf)${EPREFIX}/usr/$(get_libdir)/libnetcdf.so" + NETCDFINC="$($(tc-getPKG_CONFIG) --cflags-only-I netcdf)${EPREFIX}/usr/include" + NETCDFLDFLAGS="$($(tc-getPKG_CONFIG) --libs netcdf)" + NETCDFDYNAMIC=1 + EXPATINC="-I${EPREFIX}/usr/include" + EXPATLIB="$($(tc-getPKG_CONFIG) --libs expat)" + EXPATDYNAMIC=1 + ) + if use gromacs; then + EMAKEOPTS+=( + TNGLIB="$($(tc-getPKG_CONFIG) --libs libgromacs)" + TNGINC="-I${EPREFIX}/usr/include" + TNGDYNAMIC=1 + ) + fi + if use sqlite; then + EMAKEOPTS+=( + SQLITELIB="$($(tc-getPKG_CONFIG) --libs sqlite3)" + SQLITEINC="-I${EPREFIX}/usr/include" + SQLITEDYNAMIC=1 + ) + fi +} + +src_configure() { + local myconf="OPENGL OPENGLPBUFFER COLVARS FLTK TK TCL PTHREADS PYTHON IMD NETCDF NUMPY NOSILENT XINPUT" + rm -f configure.options && echo $myconf >> configure.options + + use cuda && myconf+=" CUDA" +# use mpi && myconf+=" MPI" + use tachyon && myconf+=" LIBTACHYON" + use xinerama && myconf+=" XINERAMA" + + export \ + PYTHON_INCLUDE_DIR="$(python_get_includedir)" \ + PYTHON_LIBRARY_DIR="$(python_get_library_path)" \ + PYTHON_LIBRARY="$(python_get_LIBS)" \ + NUMPY_INCLUDE_DIR="$(python_get_sitedir)/numpy/_core/include" \ + NUMPY_LIBRARY_DIR="$(python_get_sitedir)/numpy/_core/include" + + perl ./configure LINUX \ + ${myconf} || die +} + +src_compile() { + # build plugins + cd "${WORKDIR}"/plugins || die + + emake \ + ${EMAKEOPTS[@]} \ + LINUX + + # build vmd + cd "${S}"/src || die + emake +} + +src_install() { + # install plugins + cd "${WORKDIR}"/plugins || die + emake \ + PLUGINDIR="${ED}/usr/$(get_libdir)/${PN}/plugins" \ + distrib + + # install vmd + cd "${S}"/src || die + emake install + + # install docs + cd "${S}" || die + dodoc Announcement README doc/ig.pdf doc/ug.pdf + + # remove some of the things we don't want and need in + # /usr/lib + cd "${ED}"/usr/$(get_libdir)/vmd || die + rm -fr doc README Announcement LICENSE || \ + die "failed to clean up /usr/lib/vmd directory" + + # adjust path in vmd wrapper + sed \ + -e "s:${ED}::" -i "${ED}"/usr/bin/${PN} \ + -e "/^defaultvmddir/s:^.*$:defaultvmddir=\"${EPREFIX}/usr/$(get_libdir)/${PN}\":g" \ + || die "failed to set up vmd wrapper script" + + # install icon and generate desktop entry + insinto /usr/share/pixmaps + doins "${WORKDIR}"/vmd-patches/vmd.png + eprefixify "${WORKDIR}"/vmd-patches/vmd.desktop + domenu "${WORKDIR}"/vmd-patches/vmd.desktop +} diff --git a/sci-chemistry/vmd/vmd-1.9.4_alpha57.ebuild b/sci-chemistry/vmd/vmd-1.9.4_alpha57.ebuild deleted file mode 100644 index e0628f111574..000000000000 --- a/sci-chemistry/vmd/vmd-1.9.4_alpha57.ebuild +++ /dev/null @@ -1,267 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) - -inherit cuda desktop prefix python-single-r1 toolchain-funcs xdg - -DESCRIPTION="Visual Molecular Dynamics" -HOMEPAGE="http://www.ks.uiuc.edu/Research/vmd/" - -MY_PV="${PV/_alpha/a}" -MY_P="${PN}-${MY_PV}" -SRC_URI=" - ${MY_P}.src.tar.gz - fetch+https://dev.gentoo.org/~pacho/${PN}/${PN}-1.9.4_alpha57-gentoo-patches.tar.xz -" -S="${WORKDIR}/${MY_P}" -LICENSE="vmd" - -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" - -IUSE="cuda gromacs msms povray sqlite tachyon xinerama" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RESTRICT="fetch" - -CDEPEND="${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_USEDEP}] - ') - >=dev-lang/tk-8.6.1:0= - dev-lang/perl - dev-libs/expat - sci-libs/netcdf:0= - virtual/opengl - >=x11-libs/fltk-1.1.10-r2:1 - x11-libs/libXft - x11-libs/libXi - cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1:= ) - gromacs? ( >=sci-chemistry/gromacs-5.0.4-r1:0=[tng] ) - sqlite? ( dev-db/sqlite:3= ) - tachyon? ( >=media-gfx/tachyon-0.99_beta6 ) - xinerama? ( x11-libs/libXinerama ) -" -DEPEND="${CDEPEND}" -BDEPEND=" - virtual/pkgconfig - dev-lang/swig -" -RDEPEND="${CDEPEND} - sci-biology/stride - sci-chemistry/chemical-mime-data - sci-chemistry/surf - x11-misc/xdg-utils - x11-terms/xterm - msms? ( sci-chemistry/msms-bin ) - povray? ( media-gfx/povray ) -" -VMD_DOWNLOAD="http://www.ks.uiuc.edu/Development/Download/download.cgi?PackageName=VMD" - -# Binary only plugin -QA_PREBUILT="usr/lib*/vmd/plugins/LINUX/tcl/intersurf/bin/intersurf.so" -QA_FLAGS_IGNORED_amd64=" usr/lib64/vmd/plugins/LINUX/tcl/volutil/volutil" -QA_FLAGS_IGNORED_x86=" usr/lib/vmd/plugins/LINUX/tcl/volutil/volutil" - -pkg_nofetch() { - elog "Please download ${MY_P}.src.tar.gz from" - elog "${VMD_DOWNLOAD}" - elog "after agreeing to the license." - elog "Place it into your DISTDIR directory." -} - -src_prepare() { - # Apply user patches from ${WORKDIR} to allow patching on patches - # subdir too - cd "${WORKDIR}" - default - - # https://www.ks.uiuc.edu/Research/vmd/mailing_list/vmd-l/32121.html - # https://www.ks.uiuc.edu/Research/vmd/mailing_list/vmd-l/32116.html - eapply "${WORKDIR}"/${PN}-patches/${PN}-1.9.4a51-gentoo-plugins.patch - - use cuda && cuda_sanitize - - # Prepare plugins - cd plugins || die - - sed '/^.SILENT/d' -i $(find -name Makefile) - - sed \ - -e "s:CC = gcc:CC = $(tc-getCC):" \ - -e "s:CXX = g++:CXX = $(tc-getCXX):" \ - -e "s:COPTO =.*\":COPTO = -fPIC -o \":" \ - -e "s:LOPTO = .*\":LOPTO = ${LDFLAGS} -fPIC -o \":" \ - -e "s:CCFLAGS =.*\":CCFLAGS = ${CFLAGS}\":" \ - -e "s:CXXFLAGS =.*\":CXXFLAGS = ${CXXFLAGS}\":" \ - -e "s:SHLD = gcc:SHLD = $(tc-getCC) -shared:" \ - -e "s:SHXXLD = g++:SHXXLD = $(tc-getCXX) -shared:" \ - -e "s:-ltcl8.5:-ltcl:" \ - -i Make-arch || die "Failed to set up plugins Makefile" - - sed \ - -e '/^AR /s:=:?=:g' \ - -e '/^RANLIB /s:=:?=:g' \ - -i ../plugins/*/Makefile || die - - tc-export AR RANLIB - - sed \ - -e "s:\$(CXXFLAGS)::g" \ - -i hesstrans/Makefile || die - - # prepare vmd itself - cd "${S}" || die - - eapply "${WORKDIR}"/${PN}-patches/${PN}-1.9.4a51-gentoo-paths.patch - - # https://www.ks.uiuc.edu/Research/vmd/mailing_list/vmd-l/32122.html - eapply "${WORKDIR}"/${PN}-patches/${PN}-1.9.4-tmpdir.patch - - # PREFIX - sed \ - -e "s:/usr/include/:${EPREFIX}/usr/include:g" \ - -i configure || die - - sed \ - -e "s:gentoo-bindir:${ED}/usr/bin:g" \ - -e "s:gentoo-libdir:${ED}/usr/$(get_libdir):g" \ - -e "s:gentoo-opengl-include:${EPREFIX}/usr/include/GL:g" \ - -e "s:gentoo-opengl-libs:${EPREFIX}/usr/$(get_libdir):g" \ - -e "s:gentoo-gcc:$(tc-getCC):g" \ - -e "s:gentoo-g++:$(tc-getCXX):g" \ - -e "s:gentoo-nvcc:${EPREFIX}/opt/cuda/bin/nvcc:g" \ - -e "s:gentoo-cflags:${CFLAGS}:g" \ - -e "s:gentoo-cxxflags:${CXXFLAGS}:g" \ - -e "s:gentoo-nvflags::g" \ - -e "s:gentoo-ldflags:${LDFLAGS}:g" \ - -e "s:gentoo-plugindir:${WORKDIR}/plugins:g" \ - -e "s:gentoo-fltk-include:$(fltk-config --includedir):g" \ - -e "s:gentoo-fltk-libs:$(dirname $(fltk-config --libs)) -Wl,-rpath,$(dirname $(fltk-config --libs)):g" \ - -e "s:gentoo-libtachyon-include:${EPREFIX}/usr/include/tachyon:g" \ - -e "s:gentoo-libtachyon-libs:${EPREFIX}/usr/$(get_libdir):g" \ - -e "s:gentoo-netcdf-include:${EPREFIX}/usr/include:g" \ - -e "s:gentoo-netcdf-libs:${EPREFIX}/usr/$(get_libdir):g" \ - -i configure || die - - if use cuda; then - sed \ - -e "s:gentoo-cuda-lib:${EPREFIX}/opt/cuda/$(get_libdir):g" \ - -e "/NVCCFLAGS/s:=:= ${NVCCFLAGS}:g" \ - -i configure src/Makefile || die - sed \ - -e '/compute_/d' \ - -i configure || die - sed \ - -e 's:-gencode .*code=sm_..::' \ - -i src/Makefile || die - fi - - sed \ - -e "s:LINUXPPC:LINUX:g" \ - -e "s:LINUXALPHA:LINUX:g" \ - -e "s:LINUXAMD64:LINUX:g" \ - -e "s:gentoo-stride:${EPREFIX}/usr/bin/stride:g" \ - -e "s:gentoo-surf:${EPREFIX}/usr/bin/surf:g" \ - -e "s:gentoo-tachyon:${EPREFIX}/usr/bin/tachyon:g" \ - -i "${S}"/bin/vmd.sh || die "failed setting up vmd wrapper script" - - EMAKEOPTS=( - TCLINC="-I${EPREFIX}/usr/include" - TCLLIB="-L${EPREFIX}/usr/$(get_libdir)" - TCLLDFLAGS="-shared" - NETCDFLIB="$($(tc-getPKG_CONFIG) --libs-only-L netcdf)${EPREFIX}/usr/$(get_libdir)/libnetcdf.so" - NETCDFINC="$($(tc-getPKG_CONFIG) --cflags-only-I netcdf)${EPREFIX}/usr/include" - NETCDFLDFLAGS="$($(tc-getPKG_CONFIG) --libs netcdf)" - NETCDFDYNAMIC=1 - EXPATINC="-I${EPREFIX}/usr/include" - EXPATLIB="$($(tc-getPKG_CONFIG) --libs expat)" - EXPATLDFLAGS="-shared" - EXPATDYNAMIC=1 - ) - if use gromacs; then - EMAKEOPTS+=( - TNGLIB="$($(tc-getPKG_CONFIG) --libs libgromacs)" - TNGINC="-I${EPREFIX}/usr/include" - TNGLDFLAGS="-shared" - TNGDYNAMIC=1 - ) - fi - if use sqlite; then - EMAKEOPTS+=( - SQLITELIB="$($(tc-getPKG_CONFIG) --libs sqlite3)" - SQLITEINC="-I${EPREFIX}/usr/include" - SQLITELDFLAGS="-shared" - SQLITEDYNAMIC=1 - ) - fi -} - -src_configure() { - local myconf="OPENGL OPENGLPBUFFER COLVARS FLTK TK TCL PTHREADS PYTHON IMD NETCDF NUMPY NOSILENT XINPUT" - rm -f configure.options && echo $myconf >> configure.options - - use cuda && myconf+=" CUDA" -# use mpi && myconf+=" MPI" - use tachyon && myconf+=" LIBTACHYON" - use xinerama && myconf+=" XINERAMA" - - export \ - PYTHON_INCLUDE_DIR="$(python_get_includedir)" \ - PYTHON_LIBRARY_DIR="$(python_get_library_path)" \ - PYTHON_LIBRARY="$(python_get_LIBS)" \ - NUMPY_INCLUDE_DIR="$(python_get_sitedir)/numpy/core/include" \ - NUMPY_LIBRARY_DIR="$(python_get_sitedir)/numpy/core/include" - - perl ./configure LINUX \ - ${myconf} || die -} - -src_compile() { - # build plugins - cd "${WORKDIR}"/plugins || die - - emake \ - ${EMAKEOPTS[@]} \ - LINUX - - # build vmd - cd "${S}"/src || die - emake -} - -src_install() { - # install plugins - cd "${WORKDIR}"/plugins || die - emake \ - PLUGINDIR="${ED}/usr/$(get_libdir)/${PN}/plugins" \ - distrib - - # install vmd - cd "${S}"/src || die - emake install - - # install docs - cd "${S}" || die - dodoc Announcement README doc/ig.pdf doc/ug.pdf - - # remove some of the things we don't want and need in - # /usr/lib - cd "${ED}"/usr/$(get_libdir)/vmd || die - rm -fr doc README Announcement LICENSE || \ - die "failed to clean up /usr/lib/vmd directory" - - # adjust path in vmd wrapper - sed \ - -e "s:${ED}::" -i "${ED}"/usr/bin/${PN} \ - -e "/^defaultvmddir/s:^.*$:defaultvmddir=\"${EPREFIX}/usr/$(get_libdir)/${PN}\":g" \ - || die "failed to set up vmd wrapper script" - - # install icon and generate desktop entry - insinto /usr/share/pixmaps - doins "${WORKDIR}"/vmd-patches/vmd.png - eprefixify "${WORKDIR}"/vmd-patches/vmd.desktop - domenu "${WORKDIR}"/vmd-patches/vmd.desktop -} -- cgit v1.2.3-65-gdbad From 08de6843d377a46edb9501a6d3125aed73ef6de1 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens <ionen@gentoo.org> Date: Thu, 26 Dec 2024 03:55:57 -0500 Subject: sci-electronics/Stage: add binding := to fltk, soname changed Signed-off-by: Ionen Wolkens <ionen@gentoo.org> --- sci-electronics/Stage/Stage-4.3.0-r1.ebuild | 30 ----------------------------- sci-electronics/Stage/Stage-4.3.0-r2.ebuild | 30 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 sci-electronics/Stage/Stage-4.3.0-r1.ebuild create mode 100644 sci-electronics/Stage/Stage-4.3.0-r2.ebuild diff --git a/sci-electronics/Stage/Stage-4.3.0-r1.ebuild b/sci-electronics/Stage/Stage-4.3.0-r1.ebuild deleted file mode 100644 index 9012058a44da..000000000000 --- a/sci-electronics/Stage/Stage-4.3.0-r1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="The Stage Robot Simulator" -HOMEPAGE="http://rtv.github.io/Stage/" -SRC_URI="https://github.com/rtv/Stage/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0/4.3" -KEYWORDS="~amd64" - -RDEPEND=" - dev-libs/libltdl:0 - media-libs/libpng:0= - sys-libs/zlib:0= - x11-libs/fltk[opengl] - virtual/glu - virtual/jpeg:0 - virtual/opengl -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/libdir.patch -) diff --git a/sci-electronics/Stage/Stage-4.3.0-r2.ebuild b/sci-electronics/Stage/Stage-4.3.0-r2.ebuild new file mode 100644 index 000000000000..eb173c8f8685 --- /dev/null +++ b/sci-electronics/Stage/Stage-4.3.0-r2.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="The Stage Robot Simulator" +HOMEPAGE="http://rtv.github.io/Stage/" +SRC_URI="https://github.com/rtv/Stage/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0/4.3" +KEYWORDS="~amd64" + +RDEPEND=" + dev-libs/libltdl:0 + media-libs/libpng:0= + sys-libs/zlib:0= + x11-libs/fltk:1=[opengl] + virtual/glu + virtual/jpeg:0 + virtual/opengl +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/libdir.patch +) -- cgit v1.2.3-65-gdbad From bde7c266901d7cc0aebb7619556e0f6bb595f21f Mon Sep 17 00:00:00 2001 From: Ionen Wolkens <ionen@gentoo.org> Date: Thu, 26 Dec 2024 04:00:10 -0500 Subject: sci-libs/gmsh: add binding := to fltk, soname changed Also update [xft] due to the USE being dropped in fltk-1.4 Signed-off-by: Ionen Wolkens <ionen@gentoo.org> --- sci-libs/gmsh/gmsh-4.11.1-r2.ebuild | 138 ------------------------------------ sci-libs/gmsh/gmsh-4.11.1-r3.ebuild | 138 ++++++++++++++++++++++++++++++++++++ sci-libs/gmsh/gmsh-4.12.2-r1.ebuild | 137 ----------------------------------- sci-libs/gmsh/gmsh-4.12.2-r2.ebuild | 137 +++++++++++++++++++++++++++++++++++ sci-libs/gmsh/gmsh-4.13.1-r1.ebuild | 137 +++++++++++++++++++++++++++++++++++ sci-libs/gmsh/gmsh-4.13.1.ebuild | 137 ----------------------------------- 6 files changed, 412 insertions(+), 412 deletions(-) delete mode 100644 sci-libs/gmsh/gmsh-4.11.1-r2.ebuild create mode 100644 sci-libs/gmsh/gmsh-4.11.1-r3.ebuild delete mode 100644 sci-libs/gmsh/gmsh-4.12.2-r1.ebuild create mode 100644 sci-libs/gmsh/gmsh-4.12.2-r2.ebuild create mode 100644 sci-libs/gmsh/gmsh-4.13.1-r1.ebuild delete mode 100644 sci-libs/gmsh/gmsh-4.13.1.ebuild diff --git a/sci-libs/gmsh/gmsh-4.11.1-r2.ebuild b/sci-libs/gmsh/gmsh-4.11.1-r2.ebuild deleted file mode 100644 index deffafdf47c5..000000000000 --- a/sci-libs/gmsh/gmsh-4.11.1-r2.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) - -inherit cmake desktop fortran-2 python-any-r1 toolchain-funcs xdg-utils - -DESCRIPTION="Three-dimensional finite element mesh generator" -HOMEPAGE="https://gmsh.info https://gitlab.onelab.info/gmsh/gmsh" -SRC_URI="https://gmsh.info/src/${P}-source.tgz" -S="${WORKDIR}/${P}-source" - -LICENSE=" - GPL-2+ free-noncomm - alglib? ( MIT ) - gmm? ( LGPL-2.1+ ) - metis? ( Apache-2.0 ) - netgen? ( LGPL-2.1+ ) - voro? ( BSD ) -" -SLOT="0" -KEYWORDS="~amd64 ~x86" -## cgns is not compiling ATM, maybe fix cgns lib first -IUSE="+alglib +blas cgns eigen examples +gmm jpeg med metis mpi mumps netgen opencascade petsc pdf png python shared slepc X voro zlib" - -REQUIRED_USE=" - ^^ ( blas eigen ) - mumps? ( blas ) - slepc? ( petsc ) - " - -RDEPEND=" - virtual/fortran - X? ( x11-libs/fltk:1[xft] ) - alglib? ( sci-libs/alglib ) - blas? ( - virtual/blas - virtual/lapack - sci-libs/fftw:3.0 - ) - cgns? ( - sci-libs/cgnslib - sci-libs/hdf5:=[mpi=] - ) - eigen? ( dev-cpp/eigen ) - gmm? ( sci-mathematics/gmm ) - jpeg? ( media-libs/libjpeg-turbo ) - med? ( - sci-libs/med[mpi=] - sci-libs/hdf5:=[mpi=] - ) - metis? ( >=sci-libs/metis-5.2.0 ) - mpi? ( virtual/mpi[cxx] ) - mumps? ( sci-libs/mumps[mpi=] ) - opencascade? ( sci-libs/opencascade:* ) - pdf? ( app-text/poppler:= ) - png? ( media-libs/libpng:0 ) - petsc? ( sci-mathematics/petsc[mpi=] ) - slepc? ( sci-mathematics/slepc[mpi=] ) - voro? ( sci-libs/voro++ ) - zlib? ( sys-libs/zlib ) - " - -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - virtual/pkgconfig - python? ( dev-lang/swig:0 ) - " - -PATCHES=( - "${FILESDIR}"/${PN}-4.9.5-opencascade.patch - "${FILESDIR}"/${P}_gcc13_fix_cstdint_include.patch - "${FILESDIR}"/${P}-metis-5-2.patch -) - -pkg_setup() { - fortran-2_pkg_setup -} - -src_configure() { - local mycmakeargs=( ) - - use blas && \ - mycmakeargs+=(-DCMAKE_Fortran_COMPILER=$(tc-getF77)) - - mycmakeargs+=( - -DENABLE_ALGLIB="$(usex alglib)" - -DENABLE_BLAS_LAPACK="$(usex blas)" - -DENABLE_BUILD_DYNAMIC="$(usex shared)" - -DENABLE_CGNS="$(usex cgns)" - -DENABLE_EIGEN="$(usex eigen)" - -DENABLE_FLTK="$(usex X)" - -DENABLE_GMM="$(usex gmm)" - -DENABLE_GRAPHICS="$(usex X)" - -DENABLE_MED="$(usex med)" - -DENABLE_MPI="$(usex mpi)" - -DENABLE_METIS="$(usex metis)" - -DENABLE_MUMPS="$(usex mumps)" - -DENABLE_NETGEN="$(usex netgen)" - -DENABLE_OCC="$(usex opencascade)" - -DENABLE_PETSC="$(usex petsc)" - -DENABLE_POPPLER="$(usex pdf)" - -DENABLE_SLEPC="$(usex slepc)" - -DENABLE_PRIVATE_API="$(usex shared)" - -DENABLE_SYSTEM_CONTRIB="YES" - -DENABLE_VOROPP="$(usex voro)" - -DENABLE_WRAP_PYTHON="$(usex python)") - - cmake_src_configure -} - -src_install() { - cmake_src_install - - if use examples ; then - dodoc -r examples tutorials - docompress -x /usr/share/doc/${PF}/{examples,tutorials} - fi - - if use X ; then - newicon -s 64 "/${S}/utils/icons/gmsh-no-text.png" gmsh.png - make_desktop_entry "/usr/bin/gmsh" "Gmsh ${PV}" "gmsh" "Science;Math" - fi -} - -pkg_postinst() { - if use X ; then - xdg_icon_cache_update - fi -} - -pkg_postrm() { - if use X ; then - xdg_icon_cache_update - fi -} diff --git a/sci-libs/gmsh/gmsh-4.11.1-r3.ebuild b/sci-libs/gmsh/gmsh-4.11.1-r3.ebuild new file mode 100644 index 000000000000..8a1ae97616cf --- /dev/null +++ b/sci-libs/gmsh/gmsh-4.11.1-r3.ebuild @@ -0,0 +1,138 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) + +inherit cmake desktop fortran-2 python-any-r1 toolchain-funcs xdg-utils + +DESCRIPTION="Three-dimensional finite element mesh generator" +HOMEPAGE="https://gmsh.info https://gitlab.onelab.info/gmsh/gmsh" +SRC_URI="https://gmsh.info/src/${P}-source.tgz" +S="${WORKDIR}/${P}-source" + +LICENSE=" + GPL-2+ free-noncomm + alglib? ( MIT ) + gmm? ( LGPL-2.1+ ) + metis? ( Apache-2.0 ) + netgen? ( LGPL-2.1+ ) + voro? ( BSD ) +" +SLOT="0" +KEYWORDS="~amd64 ~x86" +## cgns is not compiling ATM, maybe fix cgns lib first +IUSE="+alglib +blas cgns eigen examples +gmm jpeg med metis mpi mumps netgen opencascade petsc pdf png python shared slepc X voro zlib" + +REQUIRED_USE=" + ^^ ( blas eigen ) + mumps? ( blas ) + slepc? ( petsc ) + " + +RDEPEND=" + virtual/fortran + X? ( x11-libs/fltk:1=[xft(+)] ) + alglib? ( sci-libs/alglib ) + blas? ( + virtual/blas + virtual/lapack + sci-libs/fftw:3.0 + ) + cgns? ( + sci-libs/cgnslib + sci-libs/hdf5:=[mpi=] + ) + eigen? ( dev-cpp/eigen ) + gmm? ( sci-mathematics/gmm ) + jpeg? ( media-libs/libjpeg-turbo ) + med? ( + sci-libs/med[mpi=] + sci-libs/hdf5:=[mpi=] + ) + metis? ( >=sci-libs/metis-5.2.0 ) + mpi? ( virtual/mpi[cxx] ) + mumps? ( sci-libs/mumps[mpi=] ) + opencascade? ( sci-libs/opencascade:* ) + pdf? ( app-text/poppler:= ) + png? ( media-libs/libpng:0 ) + petsc? ( sci-mathematics/petsc[mpi=] ) + slepc? ( sci-mathematics/slepc[mpi=] ) + voro? ( sci-libs/voro++ ) + zlib? ( sys-libs/zlib ) + " + +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + virtual/pkgconfig + python? ( dev-lang/swig:0 ) + " + +PATCHES=( + "${FILESDIR}"/${PN}-4.9.5-opencascade.patch + "${FILESDIR}"/${P}_gcc13_fix_cstdint_include.patch + "${FILESDIR}"/${P}-metis-5-2.patch +) + +pkg_setup() { + fortran-2_pkg_setup +} + +src_configure() { + local mycmakeargs=( ) + + use blas && \ + mycmakeargs+=(-DCMAKE_Fortran_COMPILER=$(tc-getF77)) + + mycmakeargs+=( + -DENABLE_ALGLIB="$(usex alglib)" + -DENABLE_BLAS_LAPACK="$(usex blas)" + -DENABLE_BUILD_DYNAMIC="$(usex shared)" + -DENABLE_CGNS="$(usex cgns)" + -DENABLE_EIGEN="$(usex eigen)" + -DENABLE_FLTK="$(usex X)" + -DENABLE_GMM="$(usex gmm)" + -DENABLE_GRAPHICS="$(usex X)" + -DENABLE_MED="$(usex med)" + -DENABLE_MPI="$(usex mpi)" + -DENABLE_METIS="$(usex metis)" + -DENABLE_MUMPS="$(usex mumps)" + -DENABLE_NETGEN="$(usex netgen)" + -DENABLE_OCC="$(usex opencascade)" + -DENABLE_PETSC="$(usex petsc)" + -DENABLE_POPPLER="$(usex pdf)" + -DENABLE_SLEPC="$(usex slepc)" + -DENABLE_PRIVATE_API="$(usex shared)" + -DENABLE_SYSTEM_CONTRIB="YES" + -DENABLE_VOROPP="$(usex voro)" + -DENABLE_WRAP_PYTHON="$(usex python)") + + cmake_src_configure +} + +src_install() { + cmake_src_install + + if use examples ; then + dodoc -r examples tutorials + docompress -x /usr/share/doc/${PF}/{examples,tutorials} + fi + + if use X ; then + newicon -s 64 "/${S}/utils/icons/gmsh-no-text.png" gmsh.png + make_desktop_entry "/usr/bin/gmsh" "Gmsh ${PV}" "gmsh" "Science;Math" + fi +} + +pkg_postinst() { + if use X ; then + xdg_icon_cache_update + fi +} + +pkg_postrm() { + if use X ; then + xdg_icon_cache_update + fi +} diff --git a/sci-libs/gmsh/gmsh-4.12.2-r1.ebuild b/sci-libs/gmsh/gmsh-4.12.2-r1.ebuild deleted file mode 100644 index 60c811c184fd..000000000000 --- a/sci-libs/gmsh/gmsh-4.12.2-r1.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) - -inherit cmake desktop fortran-2 python-any-r1 toolchain-funcs xdg-utils - -DESCRIPTION="Three-dimensional finite element mesh generator" -HOMEPAGE="https://gmsh.info https://gitlab.onelab.info/gmsh/gmsh" -SRC_URI="https://gmsh.info/src/${P}-source.tgz" -S="${WORKDIR}/${P}-source" - -LICENSE=" - GPL-2+ free-noncomm - alglib? ( MIT ) - gmm? ( LGPL-2.1+ ) - metis? ( Apache-2.0 ) - netgen? ( LGPL-2.1+ ) - voro? ( BSD ) -" -SLOT="0" -KEYWORDS="~amd64 ~x86" -## cgns is not compiling ATM, maybe fix cgns lib first -IUSE="+alglib +blas cgns eigen examples +gmm jpeg med metis mpi mumps netgen opencascade petsc pdf png python shared slepc X voro zlib" - -REQUIRED_USE=" - ^^ ( blas eigen ) - mumps? ( blas ) - slepc? ( petsc ) - " - -RDEPEND=" - virtual/fortran - X? ( x11-libs/fltk:1[xft] ) - alglib? ( sci-libs/alglib ) - blas? ( - virtual/blas - virtual/lapack - sci-libs/fftw:3.0 - ) - cgns? ( - sci-libs/cgnslib - sci-libs/hdf5:=[mpi=] - ) - eigen? ( dev-cpp/eigen ) - gmm? ( sci-mathematics/gmm ) - jpeg? ( media-libs/libjpeg-turbo ) - med? ( - sci-libs/med[mpi=] - sci-libs/hdf5:=[mpi=] - ) - metis? ( >=sci-libs/metis-5.2.0 ) - mpi? ( virtual/mpi[cxx] ) - mumps? ( sci-libs/mumps[mpi=] ) - opencascade? ( sci-libs/opencascade:* ) - pdf? ( app-text/poppler:= ) - png? ( media-libs/libpng:0 ) - petsc? ( sci-mathematics/petsc[mpi=] ) - slepc? ( sci-mathematics/slepc[mpi=] ) - voro? ( sci-libs/voro++ ) - zlib? ( sys-libs/zlib ) - " - -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - virtual/pkgconfig - python? ( dev-lang/swig:0 ) - " - -PATCHES=( - "${FILESDIR}"/${PN}-4.9.5-opencascade.patch - "${FILESDIR}"/${PN}-4.11.1-metis-5-2.patch -) - -pkg_setup() { - fortran-2_pkg_setup -} - -src_configure() { - local mycmakeargs=( ) - - use blas && \ - mycmakeargs+=(-DCMAKE_Fortran_COMPILER=$(tc-getF77)) - - mycmakeargs+=( - -DENABLE_ALGLIB="$(usex alglib)" - -DENABLE_BLAS_LAPACK="$(usex blas)" - -DENABLE_BUILD_DYNAMIC="$(usex shared)" - -DENABLE_CGNS="$(usex cgns)" - -DENABLE_EIGEN="$(usex eigen)" - -DENABLE_FLTK="$(usex X)" - -DENABLE_GMM="$(usex gmm)" - -DENABLE_GRAPHICS="$(usex X)" - -DENABLE_MED="$(usex med)" - -DENABLE_MPI="$(usex mpi)" - -DENABLE_METIS="$(usex metis)" - -DENABLE_MUMPS="$(usex mumps)" - -DENABLE_NETGEN="$(usex netgen)" - -DENABLE_OCC="$(usex opencascade)" - -DENABLE_PETSC="$(usex petsc)" - -DENABLE_POPPLER="$(usex pdf)" - -DENABLE_SLEPC="$(usex slepc)" - -DENABLE_PRIVATE_API="$(usex shared)" - -DENABLE_SYSTEM_CONTRIB="YES" - -DENABLE_VOROPP="$(usex voro)" - -DENABLE_WRAP_PYTHON="$(usex python)") - - cmake_src_configure -} - -src_install() { - cmake_src_install - - if use examples ; then - dodoc -r examples tutorials - docompress -x /usr/share/doc/${PF}/{examples,tutorials} - fi - - if use X ; then - newicon -s 64 "/${S}/utils/icons/gmsh-no-text.png" gmsh.png - make_desktop_entry "/usr/bin/gmsh" "Gmsh ${PV}" "gmsh" "Science;Math" - fi -} - -pkg_postinst() { - if use X ; then - xdg_icon_cache_update - fi -} - -pkg_postrm() { - if use X ; then - xdg_icon_cache_update - fi -} diff --git a/sci-libs/gmsh/gmsh-4.12.2-r2.ebuild b/sci-libs/gmsh/gmsh-4.12.2-r2.ebuild new file mode 100644 index 000000000000..e334c37e2aa2 --- /dev/null +++ b/sci-libs/gmsh/gmsh-4.12.2-r2.ebuild @@ -0,0 +1,137 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) + +inherit cmake desktop fortran-2 python-any-r1 toolchain-funcs xdg-utils + +DESCRIPTION="Three-dimensional finite element mesh generator" +HOMEPAGE="https://gmsh.info https://gitlab.onelab.info/gmsh/gmsh" +SRC_URI="https://gmsh.info/src/${P}-source.tgz" +S="${WORKDIR}/${P}-source" + +LICENSE=" + GPL-2+ free-noncomm + alglib? ( MIT ) + gmm? ( LGPL-2.1+ ) + metis? ( Apache-2.0 ) + netgen? ( LGPL-2.1+ ) + voro? ( BSD ) +" +SLOT="0" +KEYWORDS="~amd64 ~x86" +## cgns is not compiling ATM, maybe fix cgns lib first +IUSE="+alglib +blas cgns eigen examples +gmm jpeg med metis mpi mumps netgen opencascade petsc pdf png python shared slepc X voro zlib" + +REQUIRED_USE=" + ^^ ( blas eigen ) + mumps? ( blas ) + slepc? ( petsc ) + " + +RDEPEND=" + virtual/fortran + X? ( x11-libs/fltk:1=[xft(+)] ) + alglib? ( sci-libs/alglib ) + blas? ( + virtual/blas + virtual/lapack + sci-libs/fftw:3.0 + ) + cgns? ( + sci-libs/cgnslib + sci-libs/hdf5:=[mpi=] + ) + eigen? ( dev-cpp/eigen ) + gmm? ( sci-mathematics/gmm ) + jpeg? ( media-libs/libjpeg-turbo ) + med? ( + sci-libs/med[mpi=] + sci-libs/hdf5:=[mpi=] + ) + metis? ( >=sci-libs/metis-5.2.0 ) + mpi? ( virtual/mpi[cxx] ) + mumps? ( sci-libs/mumps[mpi=] ) + opencascade? ( sci-libs/opencascade:* ) + pdf? ( app-text/poppler:= ) + png? ( media-libs/libpng:0 ) + petsc? ( sci-mathematics/petsc[mpi=] ) + slepc? ( sci-mathematics/slepc[mpi=] ) + voro? ( sci-libs/voro++ ) + zlib? ( sys-libs/zlib ) + " + +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + virtual/pkgconfig + python? ( dev-lang/swig:0 ) + " + +PATCHES=( + "${FILESDIR}"/${PN}-4.9.5-opencascade.patch + "${FILESDIR}"/${PN}-4.11.1-metis-5-2.patch +) + +pkg_setup() { + fortran-2_pkg_setup +} + +src_configure() { + local mycmakeargs=( ) + + use blas && \ + mycmakeargs+=(-DCMAKE_Fortran_COMPILER=$(tc-getF77)) + + mycmakeargs+=( + -DENABLE_ALGLIB="$(usex alglib)" + -DENABLE_BLAS_LAPACK="$(usex blas)" + -DENABLE_BUILD_DYNAMIC="$(usex shared)" + -DENABLE_CGNS="$(usex cgns)" + -DENABLE_EIGEN="$(usex eigen)" + -DENABLE_FLTK="$(usex X)" + -DENABLE_GMM="$(usex gmm)" + -DENABLE_GRAPHICS="$(usex X)" + -DENABLE_MED="$(usex med)" + -DENABLE_MPI="$(usex mpi)" + -DENABLE_METIS="$(usex metis)" + -DENABLE_MUMPS="$(usex mumps)" + -DENABLE_NETGEN="$(usex netgen)" + -DENABLE_OCC="$(usex opencascade)" + -DENABLE_PETSC="$(usex petsc)" + -DENABLE_POPPLER="$(usex pdf)" + -DENABLE_SLEPC="$(usex slepc)" + -DENABLE_PRIVATE_API="$(usex shared)" + -DENABLE_SYSTEM_CONTRIB="YES" + -DENABLE_VOROPP="$(usex voro)" + -DENABLE_WRAP_PYTHON="$(usex python)") + + cmake_src_configure +} + +src_install() { + cmake_src_install + + if use examples ; then + dodoc -r examples tutorials + docompress -x /usr/share/doc/${PF}/{examples,tutorials} + fi + + if use X ; then + newicon -s 64 "/${S}/utils/icons/gmsh-no-text.png" gmsh.png + make_desktop_entry "/usr/bin/gmsh" "Gmsh ${PV}" "gmsh" "Science;Math" + fi +} + +pkg_postinst() { + if use X ; then + xdg_icon_cache_update + fi +} + +pkg_postrm() { + if use X ; then + xdg_icon_cache_update + fi +} diff --git a/sci-libs/gmsh/gmsh-4.13.1-r1.ebuild b/sci-libs/gmsh/gmsh-4.13.1-r1.ebuild new file mode 100644 index 000000000000..0b0e0ad7fea4 --- /dev/null +++ b/sci-libs/gmsh/gmsh-4.13.1-r1.ebuild @@ -0,0 +1,137 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit cmake desktop fortran-2 python-any-r1 toolchain-funcs xdg-utils + +DESCRIPTION="Three-dimensional finite element mesh generator" +HOMEPAGE="https://gmsh.info https://gitlab.onelab.info/gmsh/gmsh" +SRC_URI="https://gmsh.info/src/${P}-source.tgz" +S="${WORKDIR}/${P}-source" + +LICENSE=" + GPL-2+ free-noncomm + alglib? ( MIT ) + gmm? ( LGPL-2.1+ ) + metis? ( Apache-2.0 ) + netgen? ( LGPL-2.1+ ) + voro? ( BSD ) +" +SLOT="0" +KEYWORDS="~amd64 ~x86" +## cgns is not compiling ATM, maybe fix cgns lib first +IUSE="+alglib +blas cgns eigen examples +gmm jpeg med metis mpi mumps netgen opencascade petsc pdf png python shared slepc X voro zlib" + +REQUIRED_USE=" + ^^ ( blas eigen ) + mumps? ( blas ) + slepc? ( petsc ) + " + +RDEPEND=" + virtual/fortran + X? ( x11-libs/fltk:1=[xft(+)] ) + alglib? ( sci-libs/alglib ) + blas? ( + virtual/blas + virtual/lapack + sci-libs/fftw:3.0 + ) + cgns? ( + sci-libs/cgnslib + sci-libs/hdf5:=[mpi=] + ) + eigen? ( dev-cpp/eigen ) + gmm? ( sci-mathematics/gmm ) + jpeg? ( media-libs/libjpeg-turbo ) + med? ( + sci-libs/med[mpi=] + sci-libs/hdf5:=[mpi=] + ) + metis? ( >=sci-libs/metis-5.2.0 ) + mpi? ( virtual/mpi[cxx] ) + mumps? ( sci-libs/mumps[mpi=] ) + opencascade? ( sci-libs/opencascade:* ) + pdf? ( app-text/poppler:= ) + png? ( media-libs/libpng:0 ) + petsc? ( sci-mathematics/petsc[mpi=] ) + slepc? ( sci-mathematics/slepc[mpi=] ) + voro? ( sci-libs/voro++ ) + zlib? ( sys-libs/zlib ) + " + +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + virtual/pkgconfig + python? ( dev-lang/swig:0 ) + " + +PATCHES=( + "${FILESDIR}"/${PN}-4.9.5-opencascade.patch + "${FILESDIR}"/${PN}-4.11.1-metis-5-2.patch +) + +pkg_setup() { + fortran-2_pkg_setup +} + +src_configure() { + local mycmakeargs=( ) + + use blas && \ + mycmakeargs+=(-DCMAKE_Fortran_COMPILER=$(tc-getF77)) + + mycmakeargs+=( + -DENABLE_ALGLIB="$(usex alglib)" + -DENABLE_BLAS_LAPACK="$(usex blas)" + -DENABLE_BUILD_DYNAMIC="$(usex shared)" + -DENABLE_CGNS="$(usex cgns)" + -DENABLE_EIGEN="$(usex eigen)" + -DENABLE_FLTK="$(usex X)" + -DENABLE_GMM="$(usex gmm)" + -DENABLE_GRAPHICS="$(usex X)" + -DENABLE_MED="$(usex med)" + -DENABLE_MPI="$(usex mpi)" + -DENABLE_METIS="$(usex metis)" + -DENABLE_MUMPS="$(usex mumps)" + -DENABLE_NETGEN="$(usex netgen)" + -DENABLE_OCC="$(usex opencascade)" + -DENABLE_PETSC="$(usex petsc)" + -DENABLE_POPPLER="$(usex pdf)" + -DENABLE_SLEPC="$(usex slepc)" + -DENABLE_PRIVATE_API="$(usex shared)" + -DENABLE_SYSTEM_CONTRIB="YES" + -DENABLE_VOROPP="$(usex voro)" + -DENABLE_WRAP_PYTHON="$(usex python)") + + cmake_src_configure +} + +src_install() { + cmake_src_install + + if use examples ; then + dodoc -r examples tutorials + docompress -x /usr/share/doc/${PF}/{examples,tutorials} + fi + + if use X ; then + newicon -s 64 "/${S}/utils/icons/gmsh-no-text.png" gmsh.png + make_desktop_entry "/usr/bin/gmsh" "Gmsh ${PV}" "gmsh" "Science;Math" + fi +} + +pkg_postinst() { + if use X ; then + xdg_icon_cache_update + fi +} + +pkg_postrm() { + if use X ; then + xdg_icon_cache_update + fi +} diff --git a/sci-libs/gmsh/gmsh-4.13.1.ebuild b/sci-libs/gmsh/gmsh-4.13.1.ebuild deleted file mode 100644 index 5f67d86017b6..000000000000 --- a/sci-libs/gmsh/gmsh-4.13.1.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit cmake desktop fortran-2 python-any-r1 toolchain-funcs xdg-utils - -DESCRIPTION="Three-dimensional finite element mesh generator" -HOMEPAGE="https://gmsh.info https://gitlab.onelab.info/gmsh/gmsh" -SRC_URI="https://gmsh.info/src/${P}-source.tgz" -S="${WORKDIR}/${P}-source" - -LICENSE=" - GPL-2+ free-noncomm - alglib? ( MIT ) - gmm? ( LGPL-2.1+ ) - metis? ( Apache-2.0 ) - netgen? ( LGPL-2.1+ ) - voro? ( BSD ) -" -SLOT="0" -KEYWORDS="~amd64 ~x86" -## cgns is not compiling ATM, maybe fix cgns lib first -IUSE="+alglib +blas cgns eigen examples +gmm jpeg med metis mpi mumps netgen opencascade petsc pdf png python shared slepc X voro zlib" - -REQUIRED_USE=" - ^^ ( blas eigen ) - mumps? ( blas ) - slepc? ( petsc ) - " - -RDEPEND=" - virtual/fortran - X? ( x11-libs/fltk:1[xft] ) - alglib? ( sci-libs/alglib ) - blas? ( - virtual/blas - virtual/lapack - sci-libs/fftw:3.0 - ) - cgns? ( - sci-libs/cgnslib - sci-libs/hdf5:=[mpi=] - ) - eigen? ( dev-cpp/eigen ) - gmm? ( sci-mathematics/gmm ) - jpeg? ( media-libs/libjpeg-turbo ) - med? ( - sci-libs/med[mpi=] - sci-libs/hdf5:=[mpi=] - ) - metis? ( >=sci-libs/metis-5.2.0 ) - mpi? ( virtual/mpi[cxx] ) - mumps? ( sci-libs/mumps[mpi=] ) - opencascade? ( sci-libs/opencascade:* ) - pdf? ( app-text/poppler:= ) - png? ( media-libs/libpng:0 ) - petsc? ( sci-mathematics/petsc[mpi=] ) - slepc? ( sci-mathematics/slepc[mpi=] ) - voro? ( sci-libs/voro++ ) - zlib? ( sys-libs/zlib ) - " - -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - virtual/pkgconfig - python? ( dev-lang/swig:0 ) - " - -PATCHES=( - "${FILESDIR}"/${PN}-4.9.5-opencascade.patch - "${FILESDIR}"/${PN}-4.11.1-metis-5-2.patch -) - -pkg_setup() { - fortran-2_pkg_setup -} - -src_configure() { - local mycmakeargs=( ) - - use blas && \ - mycmakeargs+=(-DCMAKE_Fortran_COMPILER=$(tc-getF77)) - - mycmakeargs+=( - -DENABLE_ALGLIB="$(usex alglib)" - -DENABLE_BLAS_LAPACK="$(usex blas)" - -DENABLE_BUILD_DYNAMIC="$(usex shared)" - -DENABLE_CGNS="$(usex cgns)" - -DENABLE_EIGEN="$(usex eigen)" - -DENABLE_FLTK="$(usex X)" - -DENABLE_GMM="$(usex gmm)" - -DENABLE_GRAPHICS="$(usex X)" - -DENABLE_MED="$(usex med)" - -DENABLE_MPI="$(usex mpi)" - -DENABLE_METIS="$(usex metis)" - -DENABLE_MUMPS="$(usex mumps)" - -DENABLE_NETGEN="$(usex netgen)" - -DENABLE_OCC="$(usex opencascade)" - -DENABLE_PETSC="$(usex petsc)" - -DENABLE_POPPLER="$(usex pdf)" - -DENABLE_SLEPC="$(usex slepc)" - -DENABLE_PRIVATE_API="$(usex shared)" - -DENABLE_SYSTEM_CONTRIB="YES" - -DENABLE_VOROPP="$(usex voro)" - -DENABLE_WRAP_PYTHON="$(usex python)") - - cmake_src_configure -} - -src_install() { - cmake_src_install - - if use examples ; then - dodoc -r examples tutorials - docompress -x /usr/share/doc/${PF}/{examples,tutorials} - fi - - if use X ; then - newicon -s 64 "/${S}/utils/icons/gmsh-no-text.png" gmsh.png - make_desktop_entry "/usr/bin/gmsh" "Gmsh ${PV}" "gmsh" "Science;Math" - fi -} - -pkg_postinst() { - if use X ; then - xdg_icon_cache_update - fi -} - -pkg_postrm() { - if use X ; then - xdg_icon_cache_update - fi -} -- cgit v1.2.3-65-gdbad From ea1708d4cc25d9b809dc9de55cab6960ee96c261 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens <ionen@gentoo.org> Date: Thu, 26 Dec 2024 04:18:29 -0500 Subject: sci-libs/mathgl: add binding := to fltk, soname changed Signed-off-by: Ionen Wolkens <ionen@gentoo.org> --- sci-libs/mathgl/mathgl-8.0.1-r1.ebuild | 145 --------------------------------- sci-libs/mathgl/mathgl-8.0.1-r2.ebuild | 145 +++++++++++++++++++++++++++++++++ 2 files changed, 145 insertions(+), 145 deletions(-) delete mode 100644 sci-libs/mathgl/mathgl-8.0.1-r1.ebuild create mode 100644 sci-libs/mathgl/mathgl-8.0.1-r2.ebuild diff --git a/sci-libs/mathgl/mathgl-8.0.1-r1.ebuild b/sci-libs/mathgl/mathgl-8.0.1-r1.ebuild deleted file mode 100644 index 96df3e08c15a..000000000000 --- a/sci-libs/mathgl/mathgl-8.0.1-r1.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -WX_GTK_VER="3.2-gtk3" - -inherit cmake wxwidgets multilib flag-o-matic xdg - -DESCRIPTION="Math Graphics Library" -HOMEPAGE="https://mathgl.sourceforge.net" -SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" - -LICENSE="LGPL-3+" -SLOT="0/7.5.0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc fltk gif glut gsl hdf hdf5 jpeg mpi octave opengl openmp pdf - png qt5 static-libs threads wxwidgets zlib" - -LANGS="ru" -for l in ${LANGS}; do - IUSE+=" l10n_${l}" -done -unset l - -RDEPEND=" - virtual/opengl - fltk? ( x11-libs/fltk:1 ) - gif? ( media-libs/giflib ) - glut? ( media-libs/freeglut ) - gsl? ( >=sci-libs/gsl-2:= ) - hdf? ( sci-libs/hdf ) - hdf5? ( >=sci-libs/hdf5-1.8:=[mpi=] ) - jpeg? ( virtual/jpeg:0 ) - octave? ( >=sci-mathematics/octave-3.4.0 ) - openmp? ( sys-cluster/openmpi ) - pdf? ( media-libs/libharu ) - png? ( media-libs/libpng:0 ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - ) - wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] ) - zlib? ( sys-libs/zlib )" -DEPEND="${RDEPEND}" -BDEPEND="doc? ( app-text/texi2html virtual/texi2dvi ) - octave? ( dev-lang/swig )" - -REQUIRED_USE=" - mpi? ( hdf5 ) - openmp? ( !threads ) - png? ( zlib ) - pdf? ( png )" - -pkg_setup() { - use mpi && export CC=mpicc CXX=mpicxx -} - -PATCHES=( - # From Fedora - "${FILESDIR}"/${PN}-libharu2.4.patch -) - -src_prepare() { - # Prevent sandbox violation - sed -i -e 's/update-mime-database/true/' udav/CMakeLists.txt || die - sed -i -e 's/update-desktop-database/true/' udav/CMakeLists.txt || die - cmake_src_prepare -} - -src_configure() { - use wxwidgets && setup-wxwidgets unicode - - local mycmakeargs=() - if use hdf; then - mycmakeargs+=( - -DHDF4_INCLUDE_DIR="${EPREFIX}/usr/include" - ) - fi - mycmakeargs+=( - # No clue about this option: - # option(enable-mgl2 "Use names 'libmgl2-*' instead of 'libmgl-*'") - -DMathGL_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" - -Denable-all-docs=$(usex doc) - -Denable-fltk=$(usex fltk) - -Denable-gif=$(usex gif) - -Denable-glut=$(usex glut) - -Denable-gsl=$(usex gsl) - -Denable-hdf4=$(usex hdf) - -Denable-hdf5=$(usex hdf5) - -Denable-jpeg=$(usex jpeg) - -Denable-mpi=$(usex mpi) - -Denable-octave=$(usex octave) - -Denable-opengl=$(usex opengl) - -Denable-openmp=$(usex openmp) - -Denable-pdf=$(usex pdf) - -Denable-png=$(usex png) - -Denable-qt4=OFF - -Denable-qt5=$(usex qt5) - -Denable-qt5asqt=$(usex qt5) - -Denable-pthread=$(usex threads) - -Denable-pthr-widget=$(usex threads) - -Denable-python=OFF - -Denable-wx=$(usex wxwidgets) - -Denable-zlib=$(usex zlib) - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - dodoc README* *.txt AUTHORS - if ! use static-libs; then - rm "${ED}"/usr/$(get_libdir)/*.a || die - fi - if use qt5 ; then - local lang - insinto /usr/share/udav - for lang in ${LANGS} ; do - use l10n_${lang} && doins udav/udav_${lang}.qm - done - fi - if use octave ; then - insinto /usr/share/${PN}/octave - doins "${CMAKE_BUILD_DIR}"/lang/${PN}.tar.gz - fi -} - -pkg_postinst() { - if use octave; then - octave <<-EOF - pkg install ${EROOT}/usr/share/${PN}/octave/${PN}.tar.gz - EOF - fi - xdg_pkg_postinst -} - -pkg_prerm() { - if use octave; then - octave <<-EOF - pkg uninstall ${PN} - EOF - fi -} diff --git a/sci-libs/mathgl/mathgl-8.0.1-r2.ebuild b/sci-libs/mathgl/mathgl-8.0.1-r2.ebuild new file mode 100644 index 000000000000..53318c93823a --- /dev/null +++ b/sci-libs/mathgl/mathgl-8.0.1-r2.ebuild @@ -0,0 +1,145 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +WX_GTK_VER="3.2-gtk3" + +inherit cmake wxwidgets multilib flag-o-matic xdg + +DESCRIPTION="Math Graphics Library" +HOMEPAGE="https://mathgl.sourceforge.net" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" + +LICENSE="LGPL-3+" +SLOT="0/7.5.0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="doc fltk gif glut gsl hdf hdf5 jpeg mpi octave opengl openmp pdf + png qt5 static-libs threads wxwidgets zlib" + +LANGS="ru" +for l in ${LANGS}; do + IUSE+=" l10n_${l}" +done +unset l + +RDEPEND=" + virtual/opengl + fltk? ( x11-libs/fltk:1= ) + gif? ( media-libs/giflib ) + glut? ( media-libs/freeglut ) + gsl? ( >=sci-libs/gsl-2:= ) + hdf? ( sci-libs/hdf ) + hdf5? ( >=sci-libs/hdf5-1.8:=[mpi=] ) + jpeg? ( virtual/jpeg:0 ) + octave? ( >=sci-mathematics/octave-3.4.0 ) + openmp? ( sys-cluster/openmpi ) + pdf? ( media-libs/libharu ) + png? ( media-libs/libpng:0 ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5 + ) + wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] ) + zlib? ( sys-libs/zlib )" +DEPEND="${RDEPEND}" +BDEPEND="doc? ( app-text/texi2html virtual/texi2dvi ) + octave? ( dev-lang/swig )" + +REQUIRED_USE=" + mpi? ( hdf5 ) + openmp? ( !threads ) + png? ( zlib ) + pdf? ( png )" + +pkg_setup() { + use mpi && export CC=mpicc CXX=mpicxx +} + +PATCHES=( + # From Fedora + "${FILESDIR}"/${PN}-libharu2.4.patch +) + +src_prepare() { + # Prevent sandbox violation + sed -i -e 's/update-mime-database/true/' udav/CMakeLists.txt || die + sed -i -e 's/update-desktop-database/true/' udav/CMakeLists.txt || die + cmake_src_prepare +} + +src_configure() { + use wxwidgets && setup-wxwidgets unicode + + local mycmakeargs=() + if use hdf; then + mycmakeargs+=( + -DHDF4_INCLUDE_DIR="${EPREFIX}/usr/include" + ) + fi + mycmakeargs+=( + # No clue about this option: + # option(enable-mgl2 "Use names 'libmgl2-*' instead of 'libmgl-*'") + -DMathGL_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" + -Denable-all-docs=$(usex doc) + -Denable-fltk=$(usex fltk) + -Denable-gif=$(usex gif) + -Denable-glut=$(usex glut) + -Denable-gsl=$(usex gsl) + -Denable-hdf4=$(usex hdf) + -Denable-hdf5=$(usex hdf5) + -Denable-jpeg=$(usex jpeg) + -Denable-mpi=$(usex mpi) + -Denable-octave=$(usex octave) + -Denable-opengl=$(usex opengl) + -Denable-openmp=$(usex openmp) + -Denable-pdf=$(usex pdf) + -Denable-png=$(usex png) + -Denable-qt4=OFF + -Denable-qt5=$(usex qt5) + -Denable-qt5asqt=$(usex qt5) + -Denable-pthread=$(usex threads) + -Denable-pthr-widget=$(usex threads) + -Denable-python=OFF + -Denable-wx=$(usex wxwidgets) + -Denable-zlib=$(usex zlib) + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + dodoc README* *.txt AUTHORS + if ! use static-libs; then + rm "${ED}"/usr/$(get_libdir)/*.a || die + fi + if use qt5 ; then + local lang + insinto /usr/share/udav + for lang in ${LANGS} ; do + use l10n_${lang} && doins udav/udav_${lang}.qm + done + fi + if use octave ; then + insinto /usr/share/${PN}/octave + doins "${CMAKE_BUILD_DIR}"/lang/${PN}.tar.gz + fi +} + +pkg_postinst() { + if use octave; then + octave <<-EOF + pkg install ${EROOT}/usr/share/${PN}/octave/${PN}.tar.gz + EOF + fi + xdg_pkg_postinst +} + +pkg_prerm() { + if use octave; then + octave <<-EOF + pkg uninstall ${PN} + EOF + fi +} -- cgit v1.2.3-65-gdbad From e0eff4c74d0863092d01999b805a9d061cabdb98 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens <ionen@gentoo.org> Date: Thu, 26 Dec 2024 04:35:11 -0500 Subject: sci-mathematics/giac: add binding := to fltk, soname changed Signed-off-by: Ionen Wolkens <ionen@gentoo.org> --- sci-mathematics/giac/giac-1.9.0.29-r1.ebuild | 172 ---------------------- sci-mathematics/giac/giac-1.9.0.29-r2.ebuild | 172 ++++++++++++++++++++++ sci-mathematics/giac/giac-1.9.0.995-r1.ebuild | 198 -------------------------- sci-mathematics/giac/giac-1.9.0.995-r2.ebuild | 198 ++++++++++++++++++++++++++ 4 files changed, 370 insertions(+), 370 deletions(-) delete mode 100644 sci-mathematics/giac/giac-1.9.0.29-r1.ebuild create mode 100644 sci-mathematics/giac/giac-1.9.0.29-r2.ebuild delete mode 100644 sci-mathematics/giac/giac-1.9.0.995-r1.ebuild create mode 100644 sci-mathematics/giac/giac-1.9.0.995-r2.ebuild diff --git a/sci-mathematics/giac/giac-1.9.0.29-r1.ebuild b/sci-mathematics/giac/giac-1.9.0.29-r1.ebuild deleted file mode 100644 index f4967f08420e..000000000000 --- a/sci-mathematics/giac/giac-1.9.0.29-r1.ebuild +++ /dev/null @@ -1,172 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic xdg-utils - -FETCH_P="${PN}_"$(ver_rs 3 '-') -MY_PV=$(ver_cut 1-3) -DESCRIPTION="A free C++ Computer Algebra System library and its interfaces" -HOMEPAGE="https://www-fourier.ujf-grenoble.fr/~parisse/giac.html" -SRC_URI="https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/${FETCH_P}.tar.gz" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="amd64 ~x86" -LANGS="el en es pt" -IUSE="ao doc +ecm examples gc +glpk gui test" -for X in ${LANGS} ; do - IUSE="${IUSE} l10n_${X}" -done - -# nauty and cliquer are automagical dependencies -RDEPEND="dev-libs/gmp:=[cxx(+)] - sys-libs/readline:= - gui? ( x11-libs/fltk[opengl] - media-libs/libpng:= ) - ao? ( media-libs/libao ) - dev-libs/mpfr:= - sci-libs/mpfi - sci-libs/gsl:= - sci-mathematics/pari:=[threads] - dev-libs/ntl:= - virtual/lapack - virtual/blas - net-misc/curl - sci-mathematics/cliquer - sci-mathematics/nauty - ecm? ( sci-mathematics/gmp-ecm ) - glpk? ( sci-mathematics/glpk ) - gc? ( dev-libs/boehm-gc )" - -DEPEND="${RDEPEND}" - -BDEPEND="dev-tex/hevea - virtual/pkgconfig - app-alternatives/yacc" - -PATCHES=( - "${FILESDIR}/${PN}-1.7.0.1-gsl_lapack.patch" - "${FILESDIR}/${PN}-1.6.0-pari-2.11.patch" - "${FILESDIR}/${PN}-1.9.0.21-pari-2.15.patch" -) - -REQUIRED_USE="test? ( gui )" - -# The mirror restriction is due to the French documentation for which -# "Other kind of redistributions require the consent of the copyright -# holder." -RESTRICT="!test? ( test ) mirror" - -S="${WORKDIR}/${PN}-${MY_PV}" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - append-cxxflags -std=c++14 # bug 788283 - - if use gui; then - append-cppflags -I$(fltk-config --includedir) - append-lfs-flags - - # Get the big-L flags from fltk's LDFLAGS. - append-ldflags $(fltk-config --ldflags | sed -e 's/\(-L\S*\)\s.*/\1/') - fi - - # Using libsamplerate is currently broken - # - # The giac build system supports --docdir, but the path /usr/share/giac/doc - # is hard-coded throughout the source code, so passing anything else to - # ./configure --docdir just causes problems. Later, we'll put things right. - # - # micropython is for specific use in an upstream project, so is quickjs. - # Note that disabling fltk is not a real option. It just skip autodetection - # but doesn't disable compiling against fltk. png is needed as part of fltk - # support. - # - # As of 1.9.0.25, --{en,dis}able-gui is no op. The only way to disable gui is - # use the fltk enable flag. - econf \ - --enable-gmpxx \ - --disable-samplerate \ - --disable-micropy \ - --disable-quickjs \ - --docdir="${EPREFIX}"/usr/share/giac/doc \ - $(use_enable gui fltk) \ - $(use_enable gui png) \ - $(use_enable ao) \ - $(use_enable ecm) \ - $(use_enable glpk) \ - $(use_enable gc) - -} - -src_install() { - docompress -x "/usr/share/doc/${PF}/"{aide_cas,doc,examples} - emake install DESTDIR="${D}" - - # Move all of /usr/share/giac (which contains only documentation) to - # its /usr/share/doc/${PF} counterpart. - dodir /usr/share/doc - mv "${ED}"/usr/share/giac "${ED}/usr/share/doc/${PF}" || die - - # and create a symlink from the original location to the new one - dosym "./doc/${PF}" /usr/share/giac - - # This is duplicated in ${ED}/usr/share/doc/${PF}/examples - rm -r "${ED}/usr/share/doc/${PF}/doc/Exemples" || die - - # These aren't supposed to be installed at all. - find "${ED}/usr/share/doc/${PF}" -type f -name 'Makefile*' -delete || die - - # The French docs are not freely licensed according to the README. - rm -r "${ED}/usr/share/doc/${PF}/doc/fr" || die - - dodoc AUTHORS ChangeLog INSTALL NEWS README TROUBLES - if ! use gui; then - rm -rf \ - "${ED}"/usr/bin/x* \ - "${ED}"/usr/share/application-registry \ - "${ED}"/usr/share/applications \ - "${ED}"/usr/share/icons \ - || die "failed to clean up fltk files" - fi - - if ! use doc; then - rm -r "${ED}/usr/share/doc/${PF}/doc" || die "failed to remove doc directory" - else - for lang in ${LANGS}; do - if use l10n_$lang; then - dosym ../aide_cas "/usr/share/doc/${PF}/doc/${lang}/aide_cas" - else - rm -r "${ED}/usr/share/giac/doc/${lang}" \ - || die "failed to remove ${lang} documentation" - fi - done - fi - - if ! use examples; then - rm -r "${ED}/usr/share/doc/${PF}/examples" \ - || die "failed to remove examples" - fi - - find "${ED}" -type f -name '*.la' -delete || die -} - -pkg_postinst() { - if use gui; then - xdg_desktop_database_update - xdg_icon_cache_update - fi -} - -pkg_postrm() { - if use gui; then - xdg_desktop_database_update - xdg_icon_cache_update - fi -} diff --git a/sci-mathematics/giac/giac-1.9.0.29-r2.ebuild b/sci-mathematics/giac/giac-1.9.0.29-r2.ebuild new file mode 100644 index 000000000000..157b280018c3 --- /dev/null +++ b/sci-mathematics/giac/giac-1.9.0.29-r2.ebuild @@ -0,0 +1,172 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic xdg-utils + +FETCH_P="${PN}_"$(ver_rs 3 '-') +MY_PV=$(ver_cut 1-3) +DESCRIPTION="A free C++ Computer Algebra System library and its interfaces" +HOMEPAGE="https://www-fourier.ujf-grenoble.fr/~parisse/giac.html" +SRC_URI="https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/${FETCH_P}.tar.gz" +LICENSE="GPL-2" + +SLOT="0" +KEYWORDS="amd64 ~x86" +LANGS="el en es pt" +IUSE="ao doc +ecm examples gc +glpk gui test" +for X in ${LANGS} ; do + IUSE="${IUSE} l10n_${X}" +done + +# nauty and cliquer are automagical dependencies +RDEPEND="dev-libs/gmp:=[cxx(+)] + sys-libs/readline:= + gui? ( x11-libs/fltk:1=[opengl] + media-libs/libpng:= ) + ao? ( media-libs/libao ) + dev-libs/mpfr:= + sci-libs/mpfi + sci-libs/gsl:= + sci-mathematics/pari:=[threads] + dev-libs/ntl:= + virtual/lapack + virtual/blas + net-misc/curl + sci-mathematics/cliquer + sci-mathematics/nauty + ecm? ( sci-mathematics/gmp-ecm ) + glpk? ( sci-mathematics/glpk ) + gc? ( dev-libs/boehm-gc )" + +DEPEND="${RDEPEND}" + +BDEPEND="dev-tex/hevea + virtual/pkgconfig + app-alternatives/yacc" + +PATCHES=( + "${FILESDIR}/${PN}-1.7.0.1-gsl_lapack.patch" + "${FILESDIR}/${PN}-1.6.0-pari-2.11.patch" + "${FILESDIR}/${PN}-1.9.0.21-pari-2.15.patch" +) + +REQUIRED_USE="test? ( gui )" + +# The mirror restriction is due to the French documentation for which +# "Other kind of redistributions require the consent of the copyright +# holder." +RESTRICT="!test? ( test ) mirror" + +S="${WORKDIR}/${PN}-${MY_PV}" + +src_prepare() { + default + eautoreconf +} + +src_configure() { + append-cxxflags -std=c++14 # bug 788283 + + if use gui; then + append-cppflags -I$(fltk-config --includedir) + append-lfs-flags + + # Get the big-L flags from fltk's LDFLAGS. + append-ldflags $(fltk-config --ldflags | sed -e 's/\(-L\S*\)\s.*/\1/') + fi + + # Using libsamplerate is currently broken + # + # The giac build system supports --docdir, but the path /usr/share/giac/doc + # is hard-coded throughout the source code, so passing anything else to + # ./configure --docdir just causes problems. Later, we'll put things right. + # + # micropython is for specific use in an upstream project, so is quickjs. + # Note that disabling fltk is not a real option. It just skip autodetection + # but doesn't disable compiling against fltk. png is needed as part of fltk + # support. + # + # As of 1.9.0.25, --{en,dis}able-gui is no op. The only way to disable gui is + # use the fltk enable flag. + econf \ + --enable-gmpxx \ + --disable-samplerate \ + --disable-micropy \ + --disable-quickjs \ + --docdir="${EPREFIX}"/usr/share/giac/doc \ + $(use_enable gui fltk) \ + $(use_enable gui png) \ + $(use_enable ao) \ + $(use_enable ecm) \ + $(use_enable glpk) \ + $(use_enable gc) + +} + +src_install() { + docompress -x "/usr/share/doc/${PF}/"{aide_cas,doc,examples} + emake install DESTDIR="${D}" + + # Move all of /usr/share/giac (which contains only documentation) to + # its /usr/share/doc/${PF} counterpart. + dodir /usr/share/doc + mv "${ED}"/usr/share/giac "${ED}/usr/share/doc/${PF}" || die + + # and create a symlink from the original location to the new one + dosym "./doc/${PF}" /usr/share/giac + + # This is duplicated in ${ED}/usr/share/doc/${PF}/examples + rm -r "${ED}/usr/share/doc/${PF}/doc/Exemples" || die + + # These aren't supposed to be installed at all. + find "${ED}/usr/share/doc/${PF}" -type f -name 'Makefile*' -delete || die + + # The French docs are not freely licensed according to the README. + rm -r "${ED}/usr/share/doc/${PF}/doc/fr" || die + + dodoc AUTHORS ChangeLog INSTALL NEWS README TROUBLES + if ! use gui; then + rm -rf \ + "${ED}"/usr/bin/x* \ + "${ED}"/usr/share/application-registry \ + "${ED}"/usr/share/applications \ + "${ED}"/usr/share/icons \ + || die "failed to clean up fltk files" + fi + + if ! use doc; then + rm -r "${ED}/usr/share/doc/${PF}/doc" || die "failed to remove doc directory" + else + for lang in ${LANGS}; do + if use l10n_$lang; then + dosym ../aide_cas "/usr/share/doc/${PF}/doc/${lang}/aide_cas" + else + rm -r "${ED}/usr/share/giac/doc/${lang}" \ + || die "failed to remove ${lang} documentation" + fi + done + fi + + if ! use examples; then + rm -r "${ED}/usr/share/doc/${PF}/examples" \ + || die "failed to remove examples" + fi + + find "${ED}" -type f -name '*.la' -delete || die +} + +pkg_postinst() { + if use gui; then + xdg_desktop_database_update + xdg_icon_cache_update + fi +} + +pkg_postrm() { + if use gui; then + xdg_desktop_database_update + xdg_icon_cache_update + fi +} diff --git a/sci-mathematics/giac/giac-1.9.0.995-r1.ebuild b/sci-mathematics/giac/giac-1.9.0.995-r1.ebuild deleted file mode 100644 index 6a9a85a14f05..000000000000 --- a/sci-mathematics/giac/giac-1.9.0.995-r1.ebuild +++ /dev/null @@ -1,198 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic xdg-utils - -FETCH_P="${PN}_"$(ver_rs 3 '-') -MY_PV=$(ver_cut 1-3) -DESCRIPTION="A free C++ Computer Algebra System library and its interfaces" -HOMEPAGE="https://www-fourier.ujf-grenoble.fr/~parisse/giac.html" -SRC_URI="https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/${FETCH_P}.tar.gz" -S="${WORKDIR}/${PN}-${MY_PV}" - -# The licensing is explained in README. We disable or delete several -# bundled features (MicroPytho, QuickJS, FLTK, gl2ps) that are -# specifically mentioned there. -LICENSE="GPL-3+" - -SLOT="0" -KEYWORDS="~amd64 ~x86" -LANGS="el en es pt" -IUSE="ao doc +ecm examples gc +glpk gui test" -for X in ${LANGS} ; do - IUSE="${IUSE} l10n_${X}" -done - -# nauty and cliquer are automagical dependencies -RDEPEND="dev-libs/gmp:=[cxx(+)] - dev-libs/mpfr:= - dev-libs/ntl:= - net-misc/curl - sci-libs/mpfi - sci-libs/gsl:= - sci-mathematics/cliquer - sci-mathematics/nauty - sci-mathematics/pari:=[threads] - sys-libs/readline:= - virtual/lapack - virtual/blas - ao? ( media-libs/libao ) - ecm? ( sci-mathematics/gmp-ecm ) - gc? ( dev-libs/boehm-gc ) - glpk? ( sci-mathematics/glpk ) - gui? ( - media-libs/libpng:= - x11-libs/fltk[opengl] - x11-libs/gl2ps - )" - -DEPEND="${RDEPEND}" - -BDEPEND="dev-tex/hevea - virtual/pkgconfig - app-alternatives/yacc" - -PATCHES=( - "${FILESDIR}/${PN}-1.7.0.1-gsl_lapack.patch" - "${FILESDIR}/${PN}-1.9.0.21-pari-2.15.patch" - "${FILESDIR}/${PN}-1.9.0.67-system-gl2ps.patch" - "${FILESDIR}/${P}-glibcxx-assertions.patch" - "${FILESDIR}/${P}-fix-undefined-behavior.patch" -) - -REQUIRED_USE="test? ( gui )" - -# The mirror restriction is due to the French documentation for which -# "Other kind of redistributions require the consent of the copyright -# holder." -RESTRICT="!test? ( test ) mirror" - -src_prepare() { - # giac-1.9.0.55 tries to compile a bundled version of FLTK for you - # if you pass --enable-fltk but the system version isn't detected. - # We make sure that cannot happen under any circumstances. - rm fltk-1.3.8-source.tar.bz2 || die - - # similar deal with gl2ps - rm src/gl2ps.[ch] || die - - # These are executable (ARM) build artifacts that should not have - # been shipped. We remove them so they can be rebuilt properly. - rm src/mkjs doc/khicas.nwa || die - - # Don't waste time eautoreconfing the bundled micropython that we - # never use. - sed -e 's/micropython-1.12//g' -i Makefile.am || die - sed -e '/micropython-1.12/d' -i configure.ac || die - rm -r micropython-1.12 || die - - default - eautoreconf -} - -src_configure() { - append-cxxflags -std=c++17 # bug 788283 - - if use gui; then - append-cppflags -I$(fltk-config --includedir) - append-lfs-flags - - # Get the big-L flags from fltk's LDFLAGS. - append-ldflags $(fltk-config --ldflags | sed -e 's/\(-L\S*\)\s.*/\1/') - fi - - # Using libsamplerate is currently broken - # - # The giac build system supports --docdir, but the path /usr/share/giac/doc - # is hard-coded throughout the source code, so passing anything else to - # ./configure --docdir just causes problems. Later, we'll put things right. - # - # micropython is for specific use in an upstream project, so is quickjs. - # Note that disabling fltk is not a real option. It just skip autodetection - # but doesn't disable compiling against fltk. png is needed as part of fltk - # support. - # - # As of 1.9.0.25, --{en,dis}able-gui is no op. The only way to - # disable the gui is though --disable-fltk. - econf \ - --enable-gmpxx \ - --disable-samplerate \ - --disable-micropy \ - --disable-quickjs \ - --docdir="${EPREFIX}"/usr/share/giac/doc \ - $(use_enable gui fltk) \ - $(use_enable gui png) \ - $(use_enable ao) \ - $(use_enable ecm) \ - $(use_enable glpk) \ - $(use_enable gc) - -} - -src_install() { - docompress -x "/usr/share/doc/${PF}/"{aide_cas,doc,examples} - emake install DESTDIR="${D}" - - # Move all of /usr/share/giac (which contains only documentation) to - # its /usr/share/doc/${PF} counterpart. - dodir /usr/share/doc - mv "${ED}"/usr/share/giac "${ED}/usr/share/doc/${PF}" || die - - # and create a symlink from the original location to the new one - dosym "./doc/${PF}" /usr/share/giac - - # This is duplicated in ${ED}/usr/share/doc/${PF}/examples - rm -r "${ED}/usr/share/doc/${PF}/doc/Exemples" || die - - # These aren't supposed to be installed at all. - find "${ED}/usr/share/doc/${PF}" -type f -name 'Makefile*' -delete || die - - # The French docs are not freely licensed according to the README. - rm -r "${ED}/usr/share/doc/${PF}/doc/fr" || die - - dodoc AUTHORS ChangeLog INSTALL NEWS README TROUBLES - if ! use gui; then - rm -rf \ - "${ED}"/usr/bin/x* \ - "${ED}"/usr/share/application-registry \ - "${ED}"/usr/share/applications \ - "${ED}"/usr/share/icons \ - || die "failed to clean up fltk files" - fi - - if ! use doc; then - rm -r "${ED}/usr/share/doc/${PF}/doc" || die "failed to remove doc directory" - else - for lang in ${LANGS}; do - if use l10n_$lang; then - dosym ../aide_cas "/usr/share/doc/${PF}/doc/${lang}/aide_cas" - else - rm -r "${ED}/usr/share/giac/doc/${lang}" \ - || die "failed to remove ${lang} documentation" - fi - done - fi - - if ! use examples; then - rm -r "${ED}/usr/share/doc/${PF}/examples" \ - || die "failed to remove examples" - fi - - find "${ED}" -type f -name '*.la' -delete || die -} - -pkg_postinst() { - if use gui; then - xdg_desktop_database_update - xdg_icon_cache_update - fi -} - -pkg_postrm() { - if use gui; then - xdg_desktop_database_update - xdg_icon_cache_update - fi -} diff --git a/sci-mathematics/giac/giac-1.9.0.995-r2.ebuild b/sci-mathematics/giac/giac-1.9.0.995-r2.ebuild new file mode 100644 index 000000000000..a0a875aadaa6 --- /dev/null +++ b/sci-mathematics/giac/giac-1.9.0.995-r2.ebuild @@ -0,0 +1,198 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic xdg-utils + +FETCH_P="${PN}_"$(ver_rs 3 '-') +MY_PV=$(ver_cut 1-3) +DESCRIPTION="A free C++ Computer Algebra System library and its interfaces" +HOMEPAGE="https://www-fourier.ujf-grenoble.fr/~parisse/giac.html" +SRC_URI="https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/${FETCH_P}.tar.gz" +S="${WORKDIR}/${PN}-${MY_PV}" + +# The licensing is explained in README. We disable or delete several +# bundled features (MicroPytho, QuickJS, FLTK, gl2ps) that are +# specifically mentioned there. +LICENSE="GPL-3+" + +SLOT="0" +KEYWORDS="~amd64 ~x86" +LANGS="el en es pt" +IUSE="ao doc +ecm examples gc +glpk gui test" +for X in ${LANGS} ; do + IUSE="${IUSE} l10n_${X}" +done + +# nauty and cliquer are automagical dependencies +RDEPEND="dev-libs/gmp:=[cxx(+)] + dev-libs/mpfr:= + dev-libs/ntl:= + net-misc/curl + sci-libs/mpfi + sci-libs/gsl:= + sci-mathematics/cliquer + sci-mathematics/nauty + sci-mathematics/pari:=[threads] + sys-libs/readline:= + virtual/lapack + virtual/blas + ao? ( media-libs/libao ) + ecm? ( sci-mathematics/gmp-ecm ) + gc? ( dev-libs/boehm-gc ) + glpk? ( sci-mathematics/glpk ) + gui? ( + media-libs/libpng:= + x11-libs/fltk:1=[opengl] + x11-libs/gl2ps + )" + +DEPEND="${RDEPEND}" + +BDEPEND="dev-tex/hevea + virtual/pkgconfig + app-alternatives/yacc" + +PATCHES=( + "${FILESDIR}/${PN}-1.7.0.1-gsl_lapack.patch" + "${FILESDIR}/${PN}-1.9.0.21-pari-2.15.patch" + "${FILESDIR}/${PN}-1.9.0.67-system-gl2ps.patch" + "${FILESDIR}/${P}-glibcxx-assertions.patch" + "${FILESDIR}/${P}-fix-undefined-behavior.patch" +) + +REQUIRED_USE="test? ( gui )" + +# The mirror restriction is due to the French documentation for which +# "Other kind of redistributions require the consent of the copyright +# holder." +RESTRICT="!test? ( test ) mirror" + +src_prepare() { + # giac-1.9.0.55 tries to compile a bundled version of FLTK for you + # if you pass --enable-fltk but the system version isn't detected. + # We make sure that cannot happen under any circumstances. + rm fltk-1.3.8-source.tar.bz2 || die + + # similar deal with gl2ps + rm src/gl2ps.[ch] || die + + # These are executable (ARM) build artifacts that should not have + # been shipped. We remove them so they can be rebuilt properly. + rm src/mkjs doc/khicas.nwa || die + + # Don't waste time eautoreconfing the bundled micropython that we + # never use. + sed -e 's/micropython-1.12//g' -i Makefile.am || die + sed -e '/micropython-1.12/d' -i configure.ac || die + rm -r micropython-1.12 || die + + default + eautoreconf +} + +src_configure() { + append-cxxflags -std=c++17 # bug 788283 + + if use gui; then + append-cppflags -I$(fltk-config --includedir) + append-lfs-flags + + # Get the big-L flags from fltk's LDFLAGS. + append-ldflags $(fltk-config --ldflags | sed -e 's/\(-L\S*\)\s.*/\1/') + fi + + # Using libsamplerate is currently broken + # + # The giac build system supports --docdir, but the path /usr/share/giac/doc + # is hard-coded throughout the source code, so passing anything else to + # ./configure --docdir just causes problems. Later, we'll put things right. + # + # micropython is for specific use in an upstream project, so is quickjs. + # Note that disabling fltk is not a real option. It just skip autodetection + # but doesn't disable compiling against fltk. png is needed as part of fltk + # support. + # + # As of 1.9.0.25, --{en,dis}able-gui is no op. The only way to + # disable the gui is though --disable-fltk. + econf \ + --enable-gmpxx \ + --disable-samplerate \ + --disable-micropy \ + --disable-quickjs \ + --docdir="${EPREFIX}"/usr/share/giac/doc \ + $(use_enable gui fltk) \ + $(use_enable gui png) \ + $(use_enable ao) \ + $(use_enable ecm) \ + $(use_enable glpk) \ + $(use_enable gc) + +} + +src_install() { + docompress -x "/usr/share/doc/${PF}/"{aide_cas,doc,examples} + emake install DESTDIR="${D}" + + # Move all of /usr/share/giac (which contains only documentation) to + # its /usr/share/doc/${PF} counterpart. + dodir /usr/share/doc + mv "${ED}"/usr/share/giac "${ED}/usr/share/doc/${PF}" || die + + # and create a symlink from the original location to the new one + dosym "./doc/${PF}" /usr/share/giac + + # This is duplicated in ${ED}/usr/share/doc/${PF}/examples + rm -r "${ED}/usr/share/doc/${PF}/doc/Exemples" || die + + # These aren't supposed to be installed at all. + find "${ED}/usr/share/doc/${PF}" -type f -name 'Makefile*' -delete || die + + # The French docs are not freely licensed according to the README. + rm -r "${ED}/usr/share/doc/${PF}/doc/fr" || die + + dodoc AUTHORS ChangeLog INSTALL NEWS README TROUBLES + if ! use gui; then + rm -rf \ + "${ED}"/usr/bin/x* \ + "${ED}"/usr/share/application-registry \ + "${ED}"/usr/share/applications \ + "${ED}"/usr/share/icons \ + || die "failed to clean up fltk files" + fi + + if ! use doc; then + rm -r "${ED}/usr/share/doc/${PF}/doc" || die "failed to remove doc directory" + else + for lang in ${LANGS}; do + if use l10n_$lang; then + dosym ../aide_cas "/usr/share/doc/${PF}/doc/${lang}/aide_cas" + else + rm -r "${ED}/usr/share/giac/doc/${lang}" \ + || die "failed to remove ${lang} documentation" + fi + done + fi + + if ! use examples; then + rm -r "${ED}/usr/share/doc/${PF}/examples" \ + || die "failed to remove examples" + fi + + find "${ED}" -type f -name '*.la' -delete || die +} + +pkg_postinst() { + if use gui; then + xdg_desktop_database_update + xdg_icon_cache_update + fi +} + +pkg_postrm() { + if use gui; then + xdg_desktop_database_update + xdg_icon_cache_update + fi +} -- cgit v1.2.3-65-gdbad From b5d162d286c4a3be183d527bbc7bcec0bd7dea32 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens <ionen@gentoo.org> Date: Thu, 26 Dec 2024 05:54:19 -0500 Subject: sci-mathematics/octave: update fltk[xft] USE dep USE was removed and is default enabled. This already has := so a revbump isn't needed, if update to fltk-1.4.1 then portage will see the xft(+) when attempt to rebuild. (~arch version does not use fltk anymore) Signed-off-by: Ionen Wolkens <ionen@gentoo.org> --- sci-mathematics/octave/octave-8.3.0-r2.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sci-mathematics/octave/octave-8.3.0-r2.ebuild b/sci-mathematics/octave/octave-8.3.0-r2.ebuild index d13104f9342f..c6a00868c4b6 100644 --- a/sci-mathematics/octave/octave-8.3.0-r2.ebuild +++ b/sci-mathematics/octave/octave-8.3.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -38,7 +38,7 @@ RDEPEND=" virtual/lapack curl? ( net-misc/curl:= ) fftw? ( sci-libs/fftw:3.0= ) - fltk? ( >=x11-libs/fltk-1.3:1=[opengl,xft] ) + fltk? ( >=x11-libs/fltk-1.3:1=[opengl,xft(+)] ) glpk? ( sci-mathematics/glpk:= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( -- cgit v1.2.3-65-gdbad From c08bd80c7767e50558567b6469286d2b2a9cca03 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens <ionen@gentoo.org> Date: Thu, 26 Dec 2024 11:17:30 -0500 Subject: sci-visualization/spyview: add binding := to fltk & fix build with 1.4 1.4.x drops the case sensitivity compat symlinks by default and upstream strongly recommends to fix packages rather than re-enable them. := due to new soname Signed-off-by: Ionen Wolkens <ionen@gentoo.org> --- .../spyview/files/spyview-2018.12.24-fltk1.4.patch | 33 ++++++++++ .../spyview/spyview-2018.12.24-r1.ebuild | 73 ++++++++++++++++++++++ .../spyview/spyview-2018.12.24.ebuild | 72 --------------------- sci-visualization/spyview/spyview-9999.ebuild | 2 +- 4 files changed, 107 insertions(+), 73 deletions(-) create mode 100644 sci-visualization/spyview/files/spyview-2018.12.24-fltk1.4.patch create mode 100644 sci-visualization/spyview/spyview-2018.12.24-r1.ebuild delete mode 100644 sci-visualization/spyview/spyview-2018.12.24.ebuild diff --git a/sci-visualization/spyview/files/spyview-2018.12.24-fltk1.4.patch b/sci-visualization/spyview/files/spyview-2018.12.24-fltk1.4.patch new file mode 100644 index 000000000000..eb690101afca --- /dev/null +++ b/sci-visualization/spyview/files/spyview-2018.12.24-fltk1.4.patch @@ -0,0 +1,33 @@ +Deprecated compatibility symlinks are removed. +--- a/spyview/ImageData.C ++++ b/spyview/ImageData.C +@@ -4 +4 @@ +-#include <Fl/filename.H> ++#include <FL/filename.H> +--- a/spyview/spybrowse.C ++++ b/spyview/spybrowse.C +@@ -5,2 +5,2 @@ +-#include <Fl/filename.H> +-#include <Fl/fl_ask.H> ++#include <FL/filename.H> ++#include <FL/fl_ask.H> +--- a/spyview/spybrowse_ui.fl ++++ b/spyview/spybrowse_ui.fl +@@ -11 +11 @@ +-decl {\#include <Fl/Fl_File_Chooser.H>} {public ++decl {\#include <FL/Fl_File_Chooser.H>} {public +--- a/spyview/spybrowse_ui.h ++++ b/spyview/spybrowse_ui.h +@@ -8 +8 @@ +-#include <Fl/Fl_File_Chooser.H> ++#include <FL/Fl_File_Chooser.H> +--- a/spyview/spyview.C ++++ b/spyview/spyview.C +@@ -13 +13 @@ +-#include <Fl/fl_ask.H> ++#include <FL/fl_ask.H> +@@ -15,2 +15,2 @@ +-#include <Fl/Fl_File_Chooser.H> +-#include <Fl/filename.H> ++#include <FL/Fl_File_Chooser.H> ++#include <FL/filename.H> diff --git a/sci-visualization/spyview/spyview-2018.12.24-r1.ebuild b/sci-visualization/spyview/spyview-2018.12.24-r1.ebuild new file mode 100644 index 000000000000..e838a3ecc23f --- /dev/null +++ b/sci-visualization/spyview/spyview-2018.12.24-r1.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic + +DESCRIPTION="2D and 3D data visualization and analysis program" +HOMEPAGE="https://github.com/gsteele13/spyview" + +if [[ ${PV} == *9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/gsteele13/spyview.git" +else + SRC_URI="https://github.com/gsteele13/spyview/archive/710b9ddb6aa00fada1a758d42b57b75f92bb32a7.tar.gz -> ${P}.tgz" + KEYWORDS="amd64 ~x86" +fi + +LICENSE="GPL-3" +SLOT="0" + +COMMON_DEPEND=" + dev-libs/boost:= + media-libs/netpbm + x11-libs/fltk:1=[opengl] + app-text/ghostscript-gpl + virtual/glu +" + +DEPEND="${COMMON_DEPEND} + sys-apps/groff" + +RDEPEND="${COMMON_DEPEND} + sci-visualization/gnuplot" + +PATCHES=( + "${FILESDIR}/spyview-no-user-dirs.patch" + "${FILESDIR}/${P}-fltk1.4.patch" +) + +src_unpack() { + if [[ ${PV} == *9999* ]] ; then + git-r3_src_unpack + S="${WORKDIR}/${P}/source" + else + default + mv -v "${WORKDIR}"/spyview-*/source "${S}" || die + fi +} + +src_prepare() { + append-cflags $(fltk-config --cflags) + append-cxxflags $(fltk-config --cxxflags) + + append-cxxflags -std=c++14 + + append-cppflags -I"${EPREFIX}"/usr/include/netpbm + + # append-ldflags $(fltk-config --ldflags) + # this one leads to an insane amount of warnings + append-ldflags -L$(dirname $(fltk-config --libs)) + + while IFS="" read -d $'\0' -r file; do + sed -i -e 's:-mwindows -mconsole::g' "$file" || die + done < <(find "${S}" -name Makefile.am -print0) + + if [[ ${PV} == *9999* ]] ; then + eapply_user + else + default + fi + eautoreconf +} diff --git a/sci-visualization/spyview/spyview-2018.12.24.ebuild b/sci-visualization/spyview/spyview-2018.12.24.ebuild deleted file mode 100644 index 6dcdb79c891f..000000000000 --- a/sci-visualization/spyview/spyview-2018.12.24.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic - -DESCRIPTION="2D and 3D data visualization and analysis program" -HOMEPAGE="https://github.com/gsteele13/spyview" - -if [[ ${PV} == *9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/gsteele13/spyview.git" -else - SRC_URI="https://github.com/gsteele13/spyview/archive/710b9ddb6aa00fada1a758d42b57b75f92bb32a7.tar.gz -> ${P}.tgz" - KEYWORDS="amd64 ~x86" -fi - -LICENSE="GPL-3" -SLOT="0" - -COMMON_DEPEND=" - dev-libs/boost:= - media-libs/netpbm - x11-libs/fltk:1[opengl] - app-text/ghostscript-gpl - virtual/glu -" - -DEPEND="${COMMON_DEPEND} - sys-apps/groff" - -RDEPEND="${COMMON_DEPEND} - sci-visualization/gnuplot" - -PATCHES=( - "${FILESDIR}/spyview-no-user-dirs.patch" -) - -src_unpack() { - if [[ ${PV} == *9999* ]] ; then - git-r3_src_unpack - S="${WORKDIR}/${P}/source" - else - default - mv -v "${WORKDIR}"/spyview-*/source "${S}" || die - fi -} - -src_prepare() { - append-cflags $(fltk-config --cflags) - append-cxxflags $(fltk-config --cxxflags) - - append-cxxflags -std=c++14 - - append-cppflags -I"${EPREFIX}"/usr/include/netpbm - - # append-ldflags $(fltk-config --ldflags) - # this one leads to an insane amount of warnings - append-ldflags -L$(dirname $(fltk-config --libs)) - - while IFS="" read -d $'\0' -r file; do - sed -i -e 's:-mwindows -mconsole::g' "$file" || die - done < <(find "${S}" -name Makefile.am -print0) - - if [[ ${PV} == *9999* ]] ; then - eapply_user - else - default - fi - eautoreconf -} diff --git a/sci-visualization/spyview/spyview-9999.ebuild b/sci-visualization/spyview/spyview-9999.ebuild index ca495102a00e..e68c6227f788 100644 --- a/sci-visualization/spyview/spyview-9999.ebuild +++ b/sci-visualization/spyview/spyview-9999.ebuild @@ -22,7 +22,7 @@ SLOT="0" COMMON_DEPEND=" dev-libs/boost:= media-libs/netpbm - x11-libs/fltk:1[opengl] + x11-libs/fltk:1=[opengl] app-text/ghostscript-gpl virtual/glu " -- cgit v1.2.3-65-gdbad From ad5f2b089b5f57af7331b3b6fccc849e30393044 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens <ionen@gentoo.org> Date: Thu, 26 Dec 2024 11:42:58 -0500 Subject: www-client/dillo: pin to fltk-1.3 for now Meant to only add a binding := due to the soname change with fltk-1.4.x, but: with 3.1.1: configure: error: FLTK 1.3 required; version found: 1.4.1 With 9999 (currently): configure: error: FLTK 1.4.1 not supported yet; use FLTK 1.3 Haven't looked upstream, but from the 2nd error can assume dillo is aware and this is work in progress, so pin for now to avoid breakage. Signed-off-by: Ionen Wolkens <ionen@gentoo.org> --- www-client/dillo/dillo-3.1.1-r1.ebuild | 110 +++++++++++++++++++++++++++++++++ www-client/dillo/dillo-3.1.1.ebuild | 110 --------------------------------- www-client/dillo/dillo-9999.ebuild | 2 +- 3 files changed, 111 insertions(+), 111 deletions(-) create mode 100644 www-client/dillo/dillo-3.1.1-r1.ebuild delete mode 100644 www-client/dillo/dillo-3.1.1.ebuild diff --git a/www-client/dillo/dillo-3.1.1-r1.ebuild b/www-client/dillo/dillo-3.1.1-r1.ebuild new file mode 100644 index 000000000000..53222bcbf650 --- /dev/null +++ b/www-client/dillo/dillo-3.1.1-r1.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools toolchain-funcs virtualx xdg-utils + +DESCRIPTION="Lean FLTK based web browser" +HOMEPAGE="https://dillo-browser.github.io/" + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/dillo-browser/dillo.git" +else + SRC_URI="https://github.com/dillo-browser/dillo/releases/download/v${PV}/${P}.tar.bz2" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-3" +SLOT="0" +IUSE="debug doc +gif +jpeg mbedtls +png +ssl +openssl +xembed" +REQUIRED_USE=" + ssl? ( || ( openssl mbedtls ) ) +" + +RDEPEND=" + =x11-libs/fltk-1.3*:1= + sys-libs/zlib + x11-libs/libX11 + jpeg? ( media-libs/libjpeg-turbo:= ) + png? ( >=media-libs/libpng-1.2:= ) + ssl? ( + mbedtls? ( net-libs/mbedtls:= ) + openssl? ( dev-libs/openssl:= ) + ) + test? ( + media-fonts/dejavu + media-gfx/imagemagick[X] + x11-apps/xwd + x11-apps/xwininfo + ) +" + +DEPEND=" + ${RDEPEND} +" + +BDEPEND=" + doc? ( + app-text/doxygen[dot] + app-text/texlive + ) +" + +DOCS="AUTHORS ChangeLog README NEWS doc/*.txt doc/README" + +PATCHES=( + "${FILESDIR}"/${P}-unused-constructor.patch + "${FILESDIR}"/${P}-remove-which.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + local myeconfargs=( + $(use_enable debug rtfl) + $(use_enable gif) + $(use_enable jpeg) + $(use_enable mbedtls) + $(use_enable openssl) + $(use_enable png) + $(use_enable ssl tls) + $(use_enable xembed) + --enable-ipv6 + ) + + use test && myeconfargs+=( --enable-html-tests=yes ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + emake AR="$(tc-getAR)" + + if use doc; then + doxygen Doxyfile || die + fi +} + +src_test() { + # The test suite consistently fails with -jN in portage + virtx emake -j1 check +} + +src_install() { + default + + use doc && dodoc -r html +} + +pkg_postinst() { + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/www-client/dillo/dillo-3.1.1.ebuild b/www-client/dillo/dillo-3.1.1.ebuild deleted file mode 100644 index c196f5231273..000000000000 --- a/www-client/dillo/dillo-3.1.1.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools toolchain-funcs virtualx xdg-utils - -DESCRIPTION="Lean FLTK based web browser" -HOMEPAGE="https://dillo-browser.github.io/" - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/dillo-browser/dillo.git" -else - SRC_URI="https://github.com/dillo-browser/dillo/releases/download/v${PV}/${P}.tar.bz2" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="debug doc +gif +jpeg mbedtls +png +ssl +openssl +xembed" -REQUIRED_USE=" - ssl? ( || ( openssl mbedtls ) ) -" - -RDEPEND=" - >=x11-libs/fltk-1.3:1 - sys-libs/zlib - x11-libs/libX11 - jpeg? ( media-libs/libjpeg-turbo:= ) - png? ( >=media-libs/libpng-1.2:= ) - ssl? ( - mbedtls? ( net-libs/mbedtls:= ) - openssl? ( dev-libs/openssl:= ) - ) - test? ( - media-fonts/dejavu - media-gfx/imagemagick[X] - x11-apps/xwd - x11-apps/xwininfo - ) -" - -DEPEND=" - ${RDEPEND} -" - -BDEPEND=" - doc? ( - app-text/doxygen[dot] - app-text/texlive - ) -" - -DOCS="AUTHORS ChangeLog README NEWS doc/*.txt doc/README" - -PATCHES=( - "${FILESDIR}"/${P}-unused-constructor.patch - "${FILESDIR}"/${P}-remove-which.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myeconfargs=( - $(use_enable debug rtfl) - $(use_enable gif) - $(use_enable jpeg) - $(use_enable mbedtls) - $(use_enable openssl) - $(use_enable png) - $(use_enable ssl tls) - $(use_enable xembed) - --enable-ipv6 - ) - - use test && myeconfargs+=( --enable-html-tests=yes ) - - econf "${myeconfargs[@]}" -} - -src_compile() { - emake AR="$(tc-getAR)" - - if use doc; then - doxygen Doxyfile || die - fi -} - -src_test() { - # The test suite consistently fails with -jN in portage - virtx emake -j1 check -} - -src_install() { - default - - use doc && dodoc -r html -} - -pkg_postinst() { - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_desktop_database_update -} diff --git a/www-client/dillo/dillo-9999.ebuild b/www-client/dillo/dillo-9999.ebuild index a4d9441358ee..6afd97ac6375 100644 --- a/www-client/dillo/dillo-9999.ebuild +++ b/www-client/dillo/dillo-9999.ebuild @@ -24,7 +24,7 @@ REQUIRED_USE=" " RDEPEND=" - >=x11-libs/fltk-1.3:1 + =x11-libs/fltk-1.3*:1= sys-libs/zlib x11-libs/libX11 jpeg? ( media-libs/libjpeg-turbo:= ) -- cgit v1.2.3-65-gdbad From 4f8530b4e2cef8629f9990bbe0c066abb196816d Mon Sep 17 00:00:00 2001 From: Ionen Wolkens <ionen@gentoo.org> Date: Thu, 26 Dec 2024 11:36:39 -0500 Subject: x11-misc/xdiskusage: add binding := to fltk, soname changed Also cleanup lower bound, <1.3 is long gone. Signed-off-by: Ionen Wolkens <ionen@gentoo.org> --- x11-misc/xdiskusage/xdiskusage-1.52-r1.ebuild | 32 +++++++++++++++++++++++++++ x11-misc/xdiskusage/xdiskusage-1.52.ebuild | 32 --------------------------- 2 files changed, 32 insertions(+), 32 deletions(-) create mode 100644 x11-misc/xdiskusage/xdiskusage-1.52-r1.ebuild delete mode 100644 x11-misc/xdiskusage/xdiskusage-1.52.ebuild diff --git a/x11-misc/xdiskusage/xdiskusage-1.52-r1.ebuild b/x11-misc/xdiskusage/xdiskusage-1.52-r1.ebuild new file mode 100644 index 000000000000..2d797dfa7f0d --- /dev/null +++ b/x11-misc/xdiskusage/xdiskusage-1.52-r1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="User-friendly program to show you what is using up all your disk space" +HOMEPAGE="https://xdiskusage.sourceforge.net/" +SRC_URI="https://xdiskusage.sourceforge.net/${P}.tgz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="amd64 ~arm64 ~ppc x86" + +RDEPEND="x11-libs/fltk:1=" +BDEPEND="${RDEPEND}" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.52-flags-order.patch + "${FILESDIR}"/${PN}-1.52-pathbuf.patch +) + +src_compile() { + # override FLAGS set by configure + emake CXXFLAGS="${CXXFLAGS}" +} + +src_install() { + dobin ${PN} + doman ${PN}.1 + dodoc README +} diff --git a/x11-misc/xdiskusage/xdiskusage-1.52.ebuild b/x11-misc/xdiskusage/xdiskusage-1.52.ebuild deleted file mode 100644 index deb5d693b990..000000000000 --- a/x11-misc/xdiskusage/xdiskusage-1.52.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="User-friendly program to show you what is using up all your disk space" -HOMEPAGE="https://xdiskusage.sourceforge.net/" -SRC_URI="https://xdiskusage.sourceforge.net/${P}.tgz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc x86" - -RDEPEND=">=x11-libs/fltk-1.3:1" -BDEPEND="${RDEPEND}" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-1.52-flags-order.patch - "${FILESDIR}"/${PN}-1.52-pathbuf.patch -) - -src_compile() { - # override FLAGS set by configure - emake CXXFLAGS="${CXXFLAGS}" -} - -src_install() { - dobin ${PN} - doman ${PN}.1 - dodoc README -} -- cgit v1.2.3-65-gdbad