Merge updates from master

This commit is contained in:
Repository mirror & CI
2022-07-07 07:46:29 +00:00
150 changed files with 2624 additions and 936 deletions

View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>cyber+gentoo@sysrq.in</email>
<name>Anna</name>
</maintainer>
</pkgmetadata>

View File

@@ -0,0 +1,8 @@
# Copyright 2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit acct-group
ACCT_GROUP_ID=-1

View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>cyber+gentoo@sysrq.in</email>
<name>Anna</name>
</maintainer>
</pkgmetadata>

View File

@@ -0,0 +1,11 @@
# Copyright 2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit acct-user
ACCT_USER_ID=-1
ACCT_USER_GROUPS=( nitter )
acct-user_add_deps

View File

@@ -1 +1 @@
DIST akita-0.1.4.tar.gz 212866 BLAKE2B d6a32943eff8eb110fd4026378ecf04443a0792386ad755e28efeeba983f501f735bdae93bf798413caddec30764c9b6a2521d605e88f84a15081994361ce3ad SHA512 aeb5f6c21b4cb69c9adf58516db6ad951db562f5a12ff71f3816b9a962c4c2503120f6140f53b82893c441565676f3bc41a19ea2301728502d5a2c191372fdba
DIST akita-0.1.4.gh.tar.gz 212866 BLAKE2B d6a32943eff8eb110fd4026378ecf04443a0792386ad755e28efeeba983f501f735bdae93bf798413caddec30764c9b6a2521d605e88f84a15081994361ce3ad SHA512 aeb5f6c21b4cb69c9adf58516db6ad951db562f5a12ff71f3816b9a962c4c2503120f6140f53b82893c441565676f3bc41a19ea2301728502d5a2c191372fdba

View File

@@ -1,17 +1,17 @@
# Copyright 2021 Gentoo Authors
# Copyright 2021-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{8..10} pypy3 )
PYTHON_COMPAT=( python3_{8..11} pypy3 )
PYTHON_REQ_USE="ncurses"
DISTUTILS_USE_PEP517=setuptools
inherit distutils-r1
DESCRIPTION="An HTTP log monitoring tool for your terminal"
HOMEPAGE="https://github.com/michael-lazar/Akita https://pypi.org/project/akita/"
SRC_URI="https://github.com/michael-lazar/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/Akita-${PV}"
SRC_URI="https://github.com/michael-lazar/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
S="${WORKDIR}/${PN^}-${PV}"
LICENSE="MIT"
SLOT="0"

View File

@@ -0,0 +1 @@
DIST scim-canna-1.0.1.tar.gz 516186 BLAKE2B 03b977e841d6263f6c980e8e729122ca4ff7c9a0966f6f9daf57543250e7119a84ddfb7805804e3c5afaecba91d50d21448f49335d5a28cb967de8370b9f5dd9 SHA512 711b67211c9d1f4cb8ca09b88d455718607aa2d99e47a753fa8d71d2e1f0df8c649b64d08149785eeaa98d1399b9ca92e3df7e1be8f150ce99f28f82491b8bc1

View File

@@ -0,0 +1,201 @@
--- a/src/scim_canna_imengine_setup.cpp
+++ b/src/scim_canna_imengine_setup.cpp
@@ -152,7 +152,9 @@
// Internal data declaration.
static bool __have_changed = true;
+#if !GTK_CHECK_VERSION(2, 12, 0)
static GtkTooltips * __widget_tooltips = 0;
+#endif
static BoolConfigData __config_bool_common [] =
{
@@ -284,11 +286,17 @@
entry);
gtk_widget_show (entry->widget);
+#if !GTK_CHECK_VERSION(2, 12, 0)
if (!__widget_tooltips)
__widget_tooltips = gtk_tooltips_new();
+#endif
if (entry->tooltip)
+#if GTK_CHECK_VERSION(2, 12, 0)
+ gtk_widget_set_tooltip_text (entry->widget, _(entry->tooltip));
+#else
gtk_tooltips_set_tip (__widget_tooltips, entry->widget,
_(entry->tooltip), NULL);
+#endif
return entry->widget;
}
@@ -324,11 +332,17 @@
(GtkAttachOptions) (GTK_FILL|GTK_EXPAND),
(GtkAttachOptions) (GTK_FILL), 4, 4);
+#if !GTK_CHECK_VERSION(2, 12, 0)
if (!__widget_tooltips)
__widget_tooltips = gtk_tooltips_new();
+#endif
if (entry->tooltip)
+#if GTK_CHECK_VERSION(2, 12, 0)
+ gtk_widget_set_tooltip_text (GTK_WIDGET (entry->widget), _(entry->tooltip));
+#else
gtk_tooltips_set_tip (__widget_tooltips, GTK_WIDGET (entry->widget),
_(entry->tooltip), NULL);
+#endif
return GTK_WIDGET (entry->widget);
}
@@ -351,31 +365,53 @@
(GtkAttachOptions) (GTK_FILL), 4, 4);
gtk_widget_show (label);
+#if GTK_CHECK_VERSION(2, 4, 0)
+ entry->widget = gtk_combo_box_text_new_with_entry ();
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label),
+ gtk_bin_get_child (GTK_BIN (entry->widget)));
+ gtk_editable_set_editable (GTK_EDITABLE (gtk_bin_get_child (GTK_BIN (entry->widget))), FALSE);
+#else
entry->widget = gtk_combo_new ();
gtk_label_set_mnemonic_widget (GTK_LABEL (label),
GTK_COMBO (entry->widget)->entry);
gtk_combo_set_value_in_list (GTK_COMBO (entry->widget), TRUE, FALSE);
gtk_combo_set_case_sensitive (GTK_COMBO (entry->widget), TRUE);
- gtk_entry_set_editable (GTK_ENTRY (GTK_COMBO (entry->widget)->entry),
+ gtk_editable_set_editable (GTK_EDITABLE (GTK_COMBO (entry->widget)->entry),
FALSE);
+#endif
gtk_widget_show (GTK_WIDGET (entry->widget));
gtk_table_attach (GTK_TABLE (table), GTK_WIDGET (entry->widget),
1, 2, idx, idx + 1,
(GtkAttachOptions) (GTK_FILL|GTK_EXPAND),
(GtkAttachOptions) (GTK_FILL), 4, 4);
+#if GTK_CHECK_VERSION(2, 4, 0)
+ g_object_set_data (G_OBJECT (gtk_bin_get_child (GTK_BIN (entry->widget))),
+ DATA_POINTER_KEY,
+ (gpointer) candidates_p);
+ g_signal_connect ((gpointer) gtk_bin_get_child (GTK_BIN (entry->widget)), "changed",
+ G_CALLBACK (on_default_combo_changed),
+ entry);
+#else
g_object_set_data (G_OBJECT (GTK_COMBO (entry->widget)->entry),
DATA_POINTER_KEY,
(gpointer) candidates_p);
-
g_signal_connect ((gpointer) GTK_COMBO (entry->widget)->entry, "changed",
G_CALLBACK (on_default_combo_changed),
entry);
+#endif
+
+#if !GTK_CHECK_VERSION(2, 12, 0)
if (!__widget_tooltips)
__widget_tooltips = gtk_tooltips_new();
+#endif
if (entry->tooltip)
+#if GTK_CHECK_VERSION(2, 12, 0)
+ gtk_widget_set_tooltip_text (GTK_WIDGET (entry->widget), _(entry->tooltip));
+#else
gtk_tooltips_set_tip (__widget_tooltips, GTK_WIDGET (entry->widget),
_(entry->tooltip), NULL);
+#endif
return GTK_WIDGET (entry->widget);
}
@@ -403,11 +439,17 @@
{
GtkWidget *vbox, *frame, *table, *check, *widget;
+#if GTK_CHECK_VERSION(3, 0, 0)
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+#else
vbox = gtk_vbox_new (FALSE, 0);
+#endif
gtk_widget_show (vbox);
+#if !GTK_CHECK_VERSION(2, 12, 0)
if (!__widget_tooltips)
__widget_tooltips = gtk_tooltips_new();
+#endif
/* specify initialize file name */
frame = gtk_frame_new ("");
@@ -455,7 +497,11 @@
{
GtkWidget *vbox, *table;
+#if GTK_CHECK_VERSION(3, 0, 0)
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+#else
vbox = gtk_vbox_new (FALSE, 0);
+#endif
gtk_widget_show (vbox);
table = gtk_table_new (2, 2, FALSE);
@@ -480,7 +526,11 @@
GtkWidget *vbox, *label;
gchar str[256];
+#if GTK_CHECK_VERSION(3, 0, 0)
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+#else
vbox = gtk_vbox_new (FALSE, 0);
+#endif
gtk_widget_show (vbox);
g_snprintf (
@@ -547,8 +597,23 @@
}
static void
-setup_combo_value (GtkCombo *combo, const String & str)
+setup_combo_value (GtkWidget *combo, const String & str)
{
+#if GTK_CHECK_VERSION(2, 4, 0)
+ ComboConfigCandidate *data
+ = static_cast<ComboConfigCandidate*>
+ (g_object_get_data (G_OBJECT (gtk_bin_get_child (GTK_BIN (combo))),
+ DATA_POINTER_KEY));
+
+ gint default_index = -1;
+ for (unsigned int i = 0; data[i].label; i++) {
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _(data[i].label));
+ if (!strcmp (data[i].data, str.c_str ()))
+ default_index = i;
+ }
+ if (default_index != -1)
+ gtk_combo_box_set_active (GTK_COMBO_BOX (combo), default_index);
+#else
GList *list = NULL;
const char *defval = NULL;
@@ -563,11 +628,12 @@
defval = _(data[i].label);
}
- gtk_combo_set_popdown_strings (combo, list);
+ gtk_combo_set_popdown_strings (GTK_COMBO (combo), list);
g_list_free (list);
if (defval)
- gtk_entry_set_text (GTK_ENTRY (combo->entry), defval);
+ gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (combo)->entry), defval);
+#endif
}
static void
@@ -582,8 +648,13 @@
for (unsigned int i = 0; i < __config_string_common_num; i++) {
StringConfigData &entry = __config_string_common[i];
+#if GTK_CHECK_VERSION(2, 12, 0)
+ if (entry.widget && GTK_IS_COMBO_BOX (entry.widget))
+ setup_combo_value (entry.widget, entry.value);
+#else
if (entry.widget && GTK_IS_COMBO (entry.widget))
- setup_combo_value (GTK_COMBO (entry.widget), entry.value);
+ setup_combo_value (entry.widget, entry.value);
+#endif
else if (entry.widget && GTK_IS_ENTRY (entry.widget))
gtk_entry_set_text (GTK_ENTRY (entry.widget),
entry.value.c_str ());

View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<name>Alessandro Barbieri</name>
<email>lssndrbarbieri@gmail.com</email>
</maintainer>
</pkgmetadata>

View File

@@ -0,0 +1,54 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit autotools
DESCRIPTION="SCIM IMEngine module using Canna"
HOMEPAGE="https://osdn.net/projects/scim-imengine"
SRC_URI="https://free.nchc.org.tw/osdn//scim-imengine/29155/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64"
IUSE="debug"
RDEPEND="
app-i18n/canna
app-i18n/scim
dev-libs/atk
dev-libs/glib:2
dev-libs/libltdl
media-libs/fontconfig
media-libs/freetype
media-libs/harfbuzz:=
x11-libs/cairo
x11-libs/gdk-pixbuf:2
x11-libs/gtk+:2
x11-libs/libX11
x11-libs/pango
"
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
PATCHES=( "${FILESDIR}/${P}-fix_ftbfs_gtk3.patch" )
src_prepare() {
default
eautoreconf
}
src_configure() {
local myargs=(
--disable-static
--enable-shared
$(use_enable debug)
)
econf "${myargs[@]}"
}
src_install() {
default
find "${ED}" -name '*.la' -delete || die
}

View File

@@ -3,8 +3,8 @@
EAPI=8
PYTHON_COMPAT=(python3_{8..10})
PYTHON_REQ_USE="xml"
PYTHON_COMPAT=(python3_{8..11})
PYTHON_REQ_USE="xml(+)"
inherit distutils-r1 optfeature

View File

@@ -3,30 +3,20 @@
EAPI=7
inherit R-packages edo
inherit R-packages
DESCRIPTION="Various Programming Utilities"
KEYWORDS="~amd64"
LICENSE='LGPL-2.1+'
CRAN_PN="R.utils"
IUSE="test"
RESTRICT="!test? ( test )"
SRC_URI="mirror://cran/src/contrib/${CRAN_PN}_${PV}.tar.gz"
DEPEND="
>=dev-R/R_oo-1.24.0
>=dev-R/R_methodsS3-1.8.1
test? ( >=dev-R/digest-0.6.10 )
"
SUGGESTED_PACKAGES="
>=dev-R/digest-0.6.10
"
src_test() {
cd "${WORKDIR}/${P}/tests" || die
for i in *.R; do
R_LIBS="${T}/R" edo Rscript --vanilla $i
done
}

View File

@@ -16,6 +16,7 @@ DEPEND="
test? (
dev-R/xml2
)
>=sci-libs/nlopt-2.7.0
"
SUGGESTED_PACKAGES="

View File

@@ -1,14 +0,0 @@
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -614,9 +614,11 @@ chmod 644 ${results}/* \${line.separator}
<!-- updates / create the test results zip file -->
<target name="test-zip-archive" depends="init">
+ <!--
<archive.7z destfile="${build}/${test.archive.name}.7z"
basedir="${project.root}"
includes="${rootrel.build}/test/results ${rootrel.build}/test/results-x64 ${rootrel.build}/test/results-x32" />
+ -->
</target>

View File

@@ -0,0 +1,229 @@
Description: Add mips64(el) and mipsn32(el) support
Author: YunQiang Su <wzssyqa@gmail.com>, Dejan Latinovic <Dejan.Latinovic@imgtec.com>
Forwarded: no
--- a/make/build.xml
+++ b/make/build.xml
@@ -298,6 +298,30 @@
<property name="linker.cfg.id" value="linker.cfg.linux.mipsel" />
</target>
+ <target name="declare.linux.mipsn32" if="isLinuxMipsn32">
+ <echo message="Linux.mipsn32" />
+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
+ <property name="linker.cfg.id" value="linker.cfg.linux.mipsn32" />
+ </target>
+
+ <target name="declare.linux.mipsn32el" if="isLinuxMipsn32el">
+ <echo message="Linux.mipsn32el" />
+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
+ <property name="linker.cfg.id" value="linker.cfg.linux.mipsn32el" />
+ </target>
+
+ <target name="declare.linux.mips64" if="isLinuxMips64">
+ <echo message="Linux.mips64" />
+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
+ <property name="linker.cfg.id" value="linker.cfg.linux.mips64" />
+ </target>
+
+ <target name="declare.linux.mips64el" if="isLinuxMips64el">
+ <echo message="Linux.mips64el" />
+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
+ <property name="linker.cfg.id" value="linker.cfg.linux.mips64el" />
+ </target>
+
<target name="declare.linux.ppc" if="isLinuxPpc">
<echo message="Linux.ppc" />
<property name="compiler.cfg.id" value="compiler.cfg.linux" />
@@ -340,7 +364,7 @@
<property name="linker.cfg.id" value="linker.cfg.linux.sparc" />
</target>
- <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.alpha,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.ppc64,declare.linux.ppc64le,declare.linux.aarch64,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6.armel,declare.linux.armv6.armhf" if="isLinux" >
+ <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.alpha,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.mipsn32,declare.linux.mipsn32el,declare.linux.mips64,declare.linux.mips64el,declare.linux.ppc,declare.linux.ppc64,declare.linux.ppc64le,declare.linux.aarch64,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6.armel,declare.linux.armv6.armhf" if="isLinux" >
<property name="c.src.dir.os" value="unix" />
</target>
--- a/make/gluegen-cpptasks-base.xml
+++ b/make/gluegen-cpptasks-base.xml
@@ -47,6 +47,10 @@
- isLinuxHppa
- isLinuxMips
- isLinuxMipsel
+ - isLinuxMipsn32
+ - isLinuxMipsn32el
+ - isLinuxMips64
+ - isLinuxMipsn64el
- isLinuxPpc
- isLinuxPpc64
- isLinuxPpc64le
@@ -135,6 +139,10 @@
- compiler.cfg.linux.hppa
- compiler.cfg.linux.mips
- compiler.cfg.linux.mipsel
+ - compiler.cfg.linux.mipsn32
+ - compiler.cfg.linux.mipsn32el
+ - compiler.cfg.linux.mips64
+ - compiler.cfg.linux.mips64el
- compiler.cfg.linux.ppc
- compiler.cfg.linux.ppc64
- compiler.cfg.linux.ppc64le
@@ -160,6 +168,10 @@
- linker.cfg.linux.hppa
- linker.cfg.linux.mips
- linker.cfg.linux.mipsel
+ - linker.cfg.linux.mipsn32
+ - linker.cfg.linux.mipsn32el
+ - linker.cfg.linux.mips64
+ - linker.cfg.linux.mips64el
- linker.cfg.linux.ppc
- linker.cfg.linux.ppc64le
- linker.cfg.linux.s390
@@ -420,6 +432,42 @@
<condition property="mipsel">
<os arch="mipsel" />
</condition>
+ <condition property="isLinuxMipsn32">
+ <and>
+ <istrue value="${isLinux}" />
+ <os arch="mipsn32" />
+ </and>
+ </condition>
+ <condition property="mipsn32">
+ <os arch="mipsn32" />
+ </condition>
+ <condition property="isLinuxMipsn32el">
+ <and>
+ <istrue value="${isLinux}" />
+ <os arch="mipsn32el" />
+ </and>
+ </condition>
+ <condition property="mipsn32el">
+ <os arch="mipsn32el" />
+ </condition>
+ <condition property="isLinuxMips64">
+ <and>
+ <istrue value="${isLinux}" />
+ <os arch="mips64" />
+ </and>
+ </condition>
+ <condition property="mips64">
+ <os arch="mips64" />
+ </condition>
+ <condition property="isLinuxMips64el">
+ <and>
+ <istrue value="${isLinux}" />
+ <os arch="mips64el" />
+ </and>
+ </condition>
+ <condition property="mips64el">
+ <os arch="mips64el" />
+ </condition>
<condition property="isLinuxPpc">
<and>
<istrue value="${isLinux}" />
@@ -639,6 +687,10 @@
<echo message="LinuxHppa=${isLinuxHppa}" />
<echo message="LinuxMips=${isLinuxMips}" />
<echo message="LinuxMipsel=${isLinuxMipsel}" />
+ <echo message="LinuxMips=${isLinuxMipsn32}" />
+ <echo message="LinuxMipsel=${isLinuxMipsn32el}" />
+ <echo message="LinuxMips=${isLinuxMips64}" />
+ <echo message="LinuxMipsel=${isLinuxMips64el}" />
<echo message="LinuxPpc=${isLinuxPpc}" />
<echo message="LinuxPpc64=${isLinuxPpc64}" />
<echo message="LinuxPpc64le=${isLinuxPpc64le}" />
@@ -721,6 +773,22 @@
<property name="os.and.arch" value="linux-mipsel" />
</target>
+ <target name="gluegen.cpptasks.detect.os.linux.mipsn32" unless="gluegen.cpptasks.detected.os.2" if="isLinuxMipsn32">
+ <property name="os.and.arch" value="linux-mipsn32" />
+ </target>
+
+ <target name="gluegen.cpptasks.detect.os.linux.mipsn32el" unless="gluegen.cpptasks.detected.os.2" if="isLinuxMipsn32el">
+ <property name="os.and.arch" value="linux-mipsn32el" />
+ </target>
+
+ <target name="gluegen.cpptasks.detect.os.linux.mips64" unless="gluegen.cpptasks.detected.os.2" if="isLinuxMips64">
+ <property name="os.and.arch" value="linux-mips64" />
+ </target>
+
+ <target name="gluegen.cpptasks.detect.os.linux.mips64el" unless="gluegen.cpptasks.detected.os.2" if="isLinuxMips64el">
+ <property name="os.and.arch" value="linux-mips64el" />
+ </target>
+
<target name="gluegen.cpptasks.detect.os.linux.ppc" unless="gluegen.cpptasks.detected.os.2" if="isLinuxPpc">
<property name="os.and.arch" value="linux-ppc" />
</target>
@@ -757,7 +825,7 @@
<property name="os.and.arch" value="android-aarch64" />
</target>
- <target name="gluegen.cpptasks.detect.os.linux" depends="gluegen.cpptasks.detect.os.linux.amd64,gluegen.cpptasks.detect.os.linux.ia64,gluegen.cpptasks.detect.os.linux.x86,gluegen.cpptasks.detect.os.linux.armv6.armel,gluegen.cpptasks.detect.os.linux.armv6.armhf,gluegen.cpptasks.detect.os.android.armv6.armel,gluegen.cpptasks.detect.os.linux.aarch64,gluegen.cpptasks.detect.os.android.armv6.armhf,gluegen.cpptasks.detect.os.android.aarch64,gluegen.cpptasks.detect.os.linux.alpha,gluegen.cpptasks.detect.os.linux.hppa,gluegen.cpptasks.detect.os.linux.mips,gluegen.cpptasks.detect.os.linux.mipsel,gluegen.cpptasks.detect.os.linux.ppc,gluegen.cpptasks.detect.os.linux.ppc64,gluegen.cpptasks.detect.os.linux.ppc64le,gluegen.cpptasks.detect.os.linux.s390,gluegen.cpptasks.detect.os.linux.s390x,gluegen.cpptasks.detect.os.linux.sparc" unless="gluegen.cpptasks.detected.os.2" />
+ <target name="gluegen.cpptasks.detect.os.linux" depends="gluegen.cpptasks.detect.os.linux.amd64,gluegen.cpptasks.detect.os.linux.ia64,gluegen.cpptasks.detect.os.linux.x86,gluegen.cpptasks.detect.os.linux.armv6.armel,gluegen.cpptasks.detect.os.linux.armv6.armhf,gluegen.cpptasks.detect.os.android.armv6.armel,gluegen.cpptasks.detect.os.linux.aarch64,gluegen.cpptasks.detect.os.android.armv6.armhf,gluegen.cpptasks.detect.os.android.aarch64,gluegen.cpptasks.detect.os.linux.alpha,gluegen.cpptasks.detect.os.linux.hppa,gluegen.cpptasks.detect.os.linux.mips,gluegen.cpptasks.detect.os.linux.mipsel,gluegen.cpptasks.detect.os.linux.mipsn32,gluegen.cpptasks.detect.os.linux.mipsn32el,gluegen.cpptasks.detect.os.linux.mips64,gluegen.cpptasks.detect.os.linux.mips64el,gluegen.cpptasks.detect.os.linux.ppc,gluegen.cpptasks.detect.os.linux.ppc64,gluegen.cpptasks.detect.os.linux.ppc64le,gluegen.cpptasks.detect.os.linux.s390,gluegen.cpptasks.detect.os.linux.s390x,gluegen.cpptasks.detect.os.linux.sparc" unless="gluegen.cpptasks.detected.os.2" />
<target name="gluegen.cpptasks.detect.os.osx" unless="gluegen.cpptasks.detected.os.2" if="isOSX">
<property name="native.library.suffix" value="*lib" />
@@ -1308,6 +1376,18 @@
<linker id="linker.cfg.linux.mipsel" name="${gcc.compat.compiler}">
</linker>
+ <linker id="linker.cfg.linux.mipsn32" name="${gcc.compat.compiler}">
+ </linker>
+
+ <linker id="linker.cfg.linux.mipsn32el" name="${gcc.compat.compiler}">
+ </linker>
+
+ <linker id="linker.cfg.linux.mips64" name="${gcc.compat.compiler}">
+ </linker>
+
+ <linker id="linker.cfg.linux.mips64el" name="${gcc.compat.compiler}">
+ </linker>
+
<linker id="linker.cfg.linux.ppc" name="${gcc.compat.compiler}">
</linker>
@@ -1549,6 +1629,34 @@
<property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/mipsel" />
</target>
+ <target name="gluegen.cpptasks.declare.compiler.linux.mipsn32" if="isLinuxMipsn32">
+ <echo message="Linux.Mipsn32" />
+ <property name="compiler.cfg.id.base" value="compiler.cfg.linux" />
+ <property name="linker.cfg.id.base" value="linker.cfg.linux" />
+ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/mipsn32" />
+ </target>
+
+ <target name="gluegen.cpptasks.declare.compiler.linux.mipsn32el" if="isLinuxMipsn32el">
+ <echo message="Linux.Mipsn32el" />
+ <property name="compiler.cfg.id.base" value="compiler.cfg.linux" />
+ <property name="linker.cfg.id.base" value="linker.cfg.linux" />
+ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/mipsn32el" />
+ </target>
+
+ <target name="gluegen.cpptasks.declare.compiler.linux.mips64" if="isLinuxMips64">
+ <echo message="Linux.Mips64" />
+ <property name="compiler.cfg.id.base" value="compiler.cfg.linux" />
+ <property name="linker.cfg.id.base" value="linker.cfg.linux" />
+ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/mips64" />
+ </target>
+
+ <target name="gluegen.cpptasks.declare.compiler.linux.mips64el" if="isLinuxMips64el">
+ <echo message="Linux.Mips64el" />
+ <property name="compiler.cfg.id.base" value="compiler.cfg.linux" />
+ <property name="linker.cfg.id.base" value="linker.cfg.linux" />
+ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/mips64el" />
+ </target>
+
<target name="gluegen.cpptasks.declare.compiler.linux.ppc" if="isLinuxPpc">
<echo message="Linux.Ppc" />
<property name="compiler.cfg.id.base" value="compiler.cfg.linux" />
@@ -1591,7 +1699,7 @@
<property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/sparc" />
</target>
- <target name="gluegen.cpptasks.declare.compiler.linux" depends="gluegen.cpptasks.declare.compiler.linux.x86,gluegen.cpptasks.declare.compiler.linux.amd64,gluegen.cpptasks.declare.compiler.linux.ia64,gluegen.cpptasks.declare.compiler.linux.armv6,gluegen.cpptasks.declare.compiler.linux.aarch64,gluegen.cpptasks.declare.compiler.linux.alpha,gluegen.cpptasks.declare.compiler.linux.hppa,gluegen.cpptasks.declare.compiler.linux.mips,gluegen.cpptasks.declare.compiler.linux.mipsel,gluegen.cpptasks.declare.compiler.linux.ppc,gluegen.cpptasks.declare.compiler.linux.ppc64,gluegen.cpptasks.declare.compiler.linux.ppc64le,gluegen.cpptasks.declare.compiler.linux.s390,gluegen.cpptasks.declare.compiler.linux.s390x,gluegen.cpptasks.declare.compiler.linux.sparc" if="isLinux">
+ <target name="gluegen.cpptasks.declare.compiler.linux" depends="gluegen.cpptasks.declare.compiler.linux.x86,gluegen.cpptasks.declare.compiler.linux.amd64,gluegen.cpptasks.declare.compiler.linux.ia64,gluegen.cpptasks.declare.compiler.linux.armv6,gluegen.cpptasks.declare.compiler.linux.aarch64,gluegen.cpptasks.declare.compiler.linux.alpha,gluegen.cpptasks.declare.compiler.linux.hppa,gluegen.cpptasks.declare.compiler.linux.mips,gluegen.cpptasks.declare.compiler.linux.mipsel,gluegen.cpptasks.declare.compiler.linux.mipsn32,gluegen.cpptasks.declare.compiler.linux.mipsn32el,gluegen.cpptasks.declare.compiler.linux.mips64,gluegen.cpptasks.declare.compiler.linux.mips64el,gluegen.cpptasks.declare.compiler.linux.ppc,gluegen.cpptasks.declare.compiler.linux.ppc64,gluegen.cpptasks.declare.compiler.linux.ppc64le,gluegen.cpptasks.declare.compiler.linux.s390,gluegen.cpptasks.declare.compiler.linux.s390x,gluegen.cpptasks.declare.compiler.linux.sparc" if="isLinux">
<property name="java.includes.dir.platform" value="${java.includes.dir}/x11" />
</target>

View File

@@ -0,0 +1,62 @@
--- a/make/build.xml
+++ b/make/build.xml
@@ -262,10 +262,16 @@
<property name="linker.cfg.id" value="linker.cfg.linux" />
</target>
- <target name="declare.linux.armv6" if="isLinuxARMv6">
- <echo message="Linux.armv6" />
- <property name="compiler.cfg.id" value="compiler.cfg.linux.armv6" />
- <property name="linker.cfg.id" value="linker.cfg.linux.armv6" />
+ <target name="declare.linux.armv6.armel" if="isLinuxARMv6Armel">
+ <echo message="Linux.armv6.armel" />
+ <property name="compiler.cfg.id" value="compiler.cfg.linux.armv6.armel" />
+ <property name="linker.cfg.id" value="linker.cfg.linux.armv6.armel" />
+ </target>
+
+ <target name="declare.linux.armv6.armhf" if="isLinuxARMv6Armhf">
+ <echo message="Linux.armv6.armhf" />
+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
+ <property name="linker.cfg.id" value="linker.cfg.linux.armv6.armhf" />
</target>
<target name="declare.linux.alpha" if="isLinuxAlpha">
@@ -328,7 +334,7 @@
<property name="linker.cfg.id" value="linker.cfg.linux.sparc" />
</target>
- <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.ppc64,declare.linux.ppc64le,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6" if="isLinux" >
+ <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.ppc64,declare.linux.ppc64le,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6.armel,declare.linux.armv6.armhf" if="isLinux" >
<property name="c.src.dir.os" value="unix" />
</target>
--- a/make/gluegen-cpptasks-base.xml
+++ b/make/gluegen-cpptasks-base.xml
@@ -1032,7 +1032,7 @@
- lib/gluegen-cpptasks-linux-armv6.xml (armv5te + softfp), or
- lib/gluegen-cpptasks-linux-armv6hf.xml (armv6 + hardfp)
for official JogAmp builds! -->
- <compiler id="compiler.cfg.linux.armv6" name="${gcc.compat.compiler}">
+ <compiler id="compiler.cfg.linux.armv6.armel" name="${gcc.compat.compiler}">
<defineset>
<define name="__unix__"/>
<define name="__X11__" if="isX11"/>
@@ -1270,7 +1270,7 @@
- lib/gluegen-cpptasks-linux-armv6.xml (armv5te + softfp), or
- lib/gluegen-cpptasks-linux-armv6hf.xml (armv6 + hardfp)
for official JogAmp builds! -->
- <linker id="linker.cfg.linux.armv6" name="${gcc.compat.compiler}">
+ <linker id="linker.cfg.linux.armv6.armel" name="${gcc.compat.compiler}">
<linkerarg value="-fpic" />
<linkerarg value="-nostdlib" />
<linkerarg value="-Bdynamic" />
@@ -1286,6 +1286,9 @@
<linkerarg value="-static-libstdc++" if="isGCC"/>
</linker>
+ <linker id="linker.cfg.linux.armv6.armhf" name="${gcc.compat.compiler}">
+ </linker>
+
<linker id="linker.cfg.linux.alpha" name="${gcc.compat.compiler}">
</linker>

View File

@@ -0,0 +1,28 @@
Description: Disables the Java version check since the JRE in Debian always
meets the minimum requirement and the check routinely breaks with the latest JREs.
Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: not-needed
--- a/make/jogamp-env.xml
+++ b/make/jogamp-env.xml
@@ -45,21 +45,6 @@
</condition>
</fail>
- <fail message="Unsupported Java version: ${ant.java.version}. Make sure that the version of the Java compiler is 1.6 (6.0) or greater.">
- <condition>
- <not>
- <or>
- <equals arg1="${ant.java.version}" arg2="1.6"/>
- <equals arg1="${ant.java.version}" arg2="1.7"/>
- <equals arg1="${ant.java.version}" arg2="1.8"/>
- <equals arg1="${ant.java.version}" arg2="1.9"/>
- <equals arg1="${ant.java.version}" arg2="2.0"/>
- <equals arg1="${ant.java.version}" arg2="2.1"/>
- </or>
- </not>
- </condition>
- </fail>
-
</target>
<target name="jogamp.env.init" depends="jogamp.env.validation">

View File

@@ -0,0 +1,42 @@
Description: disable static linking for native libraries.
Author: Gilles Filippini <pini@debian.org>
--- a/make/gluegen-cpptasks-base.xml
+++ b/make/gluegen-cpptasks-base.xml
@@ -1262,20 +1262,14 @@
<!-- Unix linker configuration -->
<linker id="linker.cfg.linux" name="${gcc.compat.compiler}">
- <linkerarg value="-static-libgcc" if="isGCC"/>
- <linkerarg value="-static-libstdc++" if="isGCC"/>
</linker>
<linker id="linker.cfg.linux.x86" name="${gcc.compat.compiler}">
<linkerarg value="-m32"/>
- <linkerarg value="-static-libgcc" if="isGCC"/>
- <linkerarg value="-static-libstdc++" if="isGCC"/>
</linker>
<linker id="linker.cfg.linux.amd64" name="${gcc.compat.compiler}">
<linkerarg value="-m64"/>
- <linkerarg value="-static-libgcc" if="isGCC"/>
- <linkerarg value="-static-libstdc++" if="isGCC"/>
</linker>
<!-- Using default compiler settings - utilize:
@@ -1286,16 +1280,12 @@
<linkerarg value="-fpic" />
<linkerarg value="-nostdlib" />
<linkerarg value="-Bdynamic" />
- <linkerarg value="-static-libgcc" if="isGCC"/>
- <linkerarg value="-static-libstdc++" if="isGCC"/>
</linker>
<linker id="linker.cfg.linux.aarch64" name="${gcc.compat.compiler}">
<linkerarg value="-fpic" />
<linkerarg value="-nostdlib" />
<linkerarg value="-Bdynamic" />
- <linkerarg value="-static-libgcc" if="isGCC"/>
- <linkerarg value="-static-libstdc++" if="isGCC"/>
</linker>
<linker id="linker.cfg.linux.armv6.armhf" name="${gcc.compat.compiler}">

View File

@@ -0,0 +1,11 @@
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -505,7 +505,7 @@
</target>
<target name="junit.run" depends="junit.run.settings, junit.run.if.enabled, junit.run.if.disabled">
- <antcall target="test-zip-archive" inheritRefs="true" />
+<!-- <antcall target="test-zip-archive" inheritRefs="true" />-->
</target>
<!--

View File

@@ -0,0 +1,26 @@
--- a/make/build.xml
+++ b/make/build.xml
@@ -1088,9 +1088,9 @@
<copy todir="${javadoc.gluegen.path}/resources" overwrite="true">
<fileset dir="doc/javadoc/resources" includes="*" />
</copy>
- <archive.7z destfile="${build}/javadoc.7z"
+<!-- <archive.7z destfile="${build}/javadoc.7z"
basedir="${javadoc.root.path}"
- includes="gluegen/**" />
+ includes="gluegen/**" />-->
</target>
<!-- ================================================================== -->
@@ -1138,9 +1138,9 @@
<fileset dir="lib" includes="junit.jar"/>
</copy>
- <archive.7z destfile="${build}/${archive.name}.7z"
+<!-- <archive.7z destfile="${build}/${archive.name}.7z"
basedir="${build}"
- includes="${archive.name}/**" />
+ includes="${archive.name}/**" />-->
<!-- Clean up after ourselves -->
<delete includeEmptyDirs="true" quiet="true" dir="${archive}" failonerror="false" />
</target>

View File

@@ -0,0 +1,17 @@
--- a/make/build.xml
+++ b/make/build.xml
@@ -70,14 +70,6 @@
<property name="gluegen.build.number" value="manual"/>
<property name="gluegen.build.id" value="${version.timestamp}"/>
<mkdir dir="${build}" />
- <exec dir="." executable="git" logError="true" failonerror="false" failifexecutionfails="false"
- output="${build}/localbranch.raw">
- <arg line="branch --no-color"/>
- </exec>
- <exec dir="." executable="sed" logError="true" failonerror="false" failifexecutionfails="false"
- outputproperty="gluegen.build.branch">
- <arg line="-e '/^[^*]/d' -e 's/* \(.*\)/\1/' '${build}/localbranch.raw'"/>
- </exec>
<property name="gluegen.build.branch" value="manual"/> <!-- fallback -->
<exec dir="${project.root}" executable="git" logError="true" failonerror="false" failifexecutionfails="false"
outputproperty="gluegen.build.commit">

View File

@@ -1,6 +1,6 @@
--- a/make/gluegen-cpptasks-base.xml
+++ b/make/gluegen-cpptasks-base.xml
@@ -1511,17 +1511,6 @@
@@ -1872,16 +1872,6 @@
- Helper strip.libraries for stripping off debug information
-->
<target name="gluegen.cpptasks.striplibs" depends="gluegen.cpptasks.initialize" if="c.strip.libraries">
@@ -12,7 +12,6 @@
- <include name="**/*.so"/> <!-- unix -->
- <include name="**/*.dll"/> <!-- windows -->
- <include name="**/*.dylib"/> <!-- macosx -->
- <include name="**/*.jnilib"/> <!-- macosx -->
- </fileset>
- </apply>
</target>

View File

@@ -0,0 +1,11 @@
--- a/make/build.xml
+++ b/make/build.xml
@@ -334,7 +334,7 @@
<property name="linker.cfg.id" value="linker.cfg.linux.sparc" />
</target>
- <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.ppc64,declare.linux.ppc64le,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6.armel,declare.linux.armv6.armhf" if="isLinux" >
+ <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.alpha,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.ppc64,declare.linux.ppc64le,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6.armel,declare.linux.armv6.armhf" if="isLinux" >
<property name="c.src.dir.os" value="unix" />
</target>

View File

@@ -0,0 +1,75 @@
--- a/make/build.xml
+++ b/make/build.xml
@@ -316,6 +316,12 @@
<property name="linker.cfg.id" value="linker.cfg.linux.ppc64le" />
</target>
+ <target name="declare.linux.aarch64" if="isLinuxAarch64">
+ <echo message="Linux.aarch64" />
+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
+ <property name="linker.cfg.id" value="linker.cfg.linux.aarch64" />
+ </target>
+
<target name="declare.linux.s390" if="isLinuxs390">
<echo message="Linux.s390" />
<property name="compiler.cfg.id" value="compiler.cfg.linux" />
@@ -334,7 +340,7 @@
<property name="linker.cfg.id" value="linker.cfg.linux.sparc" />
</target>
- <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.alpha,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.ppc64,declare.linux.ppc64le,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6.armel,declare.linux.armv6.armhf" if="isLinux" >
+ <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.alpha,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.ppc64,declare.linux.ppc64le,declare.linux.aarch64,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6.armel,declare.linux.armv6.armhf" if="isLinux" >
<property name="c.src.dir.os" value="unix" />
</target>
--- a/make/gluegen-cpptasks-base.xml
+++ b/make/gluegen-cpptasks-base.xml
@@ -50,6 +50,7 @@
- isLinuxPpc
- isLinuxPpc64
- isLinuxPpc64le
+ - isLinuxAarch64
- isLinuxs390
- isLinuxs390x
- isLinuxSparc
@@ -137,6 +138,7 @@
- compiler.cfg.linux.ppc
- compiler.cfg.linux.ppc64
- compiler.cfg.linux.ppc64le
+ - compiler.cfg.linux.aarch64
- compiler.cfg.linux.s390
- compiler.cfg.linux.s390x
- compiler.cfg.linux.sparc
@@ -440,6 +442,15 @@
<condition property="ppc64le">
<os arch="ppc64le" />
</condition>
+ <condition property="isLinuxAarch64">
+ <and>
+ <istrue value="${isLinux}" />
+ <os arch="aarch64" />
+ </and>
+ </condition>
+ <condition property="aarch64">
+ <os arch="aarch64" />
+ </condition>
<condition property="isLinuxs390">
<and>
<istrue value="${isLinux}" />
@@ -626,6 +637,7 @@
<echo message="LinuxPpc=${isLinuxPpc}" />
<echo message="LinuxPpc64=${isLinuxPpc64}" />
<echo message="LinuxPpc64le=${isLinuxPpc64le}" />
+ <echo message="LinuxAarch64=${isLinuxAarch64}" />
<echo message="Linuxs390=${isLinuxs390}" />
<echo message="Linuxs390x=${isLinuxs390x}" />
<echo message="LinuxSparc=${isLinuxSparc}" />
@@ -1511,7 +1523,7 @@
<echo message="Linux.aarch64" />
<property name="compiler.cfg.id.base" value="compiler.cfg.linux.aarch64" />
<property name="linker.cfg.id.base" value="linker.cfg.linux.aarch64" />
- <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/arm" />
+ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/aarch64" />
</target>
<target name="gluegen.cpptasks.declare.compiler.linux.ia64" if="isLinuxIA64">

View File

@@ -0,0 +1,18 @@
Description: Fix ftbfs with GCC-10
Author: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Bug-Debian: https://bugs.debian.org/957276
Forwarded: no
--- a/src/junit/com/jogamp/gluegen/test/junit/generation/test1.h
+++ b/src/junit/com/jogamp/gluegen/test/junit/generation/test1.h
@@ -299,9 +299,6 @@ MYAPI MYAPIConfig * MYAPIENTRY typeTest
#define HUGE_VALF_3 ((int) 1e53)
#define DOUBLE_DEFINE_BRACKETS_3 HUGE_VALF_3
-size_t unsigned_size_t_1;
-ptrdiff_t a_signed_pointer_t_1;
-
MYAPI int32_t MYAPIENTRY typeTestInt32T(const int32_t i1, int32_t i2);
MYAPI uint32_t MYAPIENTRY typeTestUInt32T(const uint32_t ui1, uint32_t ui2);
MYAPI int64_t MYAPIENTRY typeTestInt64T(const int64_t i1, int64_t i2);

View File

@@ -0,0 +1,18 @@
--- a/src/java/com/jogamp/common/os/Platform.java
+++ b/src/java/com/jogamp/common/os/Platform.java
@@ -305,15 +305,6 @@ public class Platform extends PlatformPr
_USE_TEMP_JAR_CACHE[0] = ( OS_TYPE != OSType.ANDROID ) && ( null != platformClassJarURI ) &&
PropertyAccess.getBooleanProperty(useTempJarCachePropName, true, true);
- // load GluegenRT native library
- if(_USE_TEMP_JAR_CACHE[0] && TempJarCache.initSingleton()) {
- try {
- JNILibLoaderBase.addNativeJarLibs(new Class<?>[] { jogamp.common.Debug.class }, null);
- } catch (final Exception e0) {
- // IllegalArgumentException, IOException
- System.err.println("Caught "+e0.getClass().getSimpleName()+": "+e0.getMessage()+", while JNILibLoaderBase.addNativeJarLibs(..)");
- }
- }
DynamicLibraryBundle.GlueJNILibLoader.loadLibrary(libBaseName, false, cl);
// JVM bug workaround

View File

@@ -0,0 +1,263 @@
Description: Fixes the build failure with Java 10
Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: no
--- a/src/java/net/highteq/nativetaglet/NativeTaglet.java
+++ /dev/null
@@ -1,237 +0,0 @@
-package net.highteq.nativetaglet;
-
-import com.sun.tools.doclets.Taglet;
-import com.sun.javadoc.*;
-
-import java.util.Map;
-import java.util.Properties;
-import java.util.Iterator;
-import java.io.InputStream;
-import java.net.URL;
-import java.net.MalformedURLException;
-
-public class NativeTaglet implements Taglet
-{
- private Properties mapping= null;
- private static final String NAME = "native";
-
- /**
- * Return the name of this custom tag.
- */
- @Override
- public String getName()
- {
- return NAME;
- }
-
- /**
- * @return true since this tag can be used in a field
- * doc comment
- */
- @Override
- public boolean inField()
- {
- return true;
- }
-
- /**
- * @return true since this tag can be used in a constructor
- * doc comment
- */
- @Override
- public boolean inConstructor()
- {
- return true;
- }
-
- /**
- * @return true since this tag can be used in a method
- * doc comment
- */
- @Override
- public boolean inMethod()
- {
- return true;
- }
-
- /**
- * @return true since this tag can be used in an overview
- * doc comment
- */
- @Override
- public boolean inOverview()
- {
- return true;
- }
-
- /**
- * @return true since this tag can be used in a package
- * doc comment
- */
- @Override
- public boolean inPackage()
- {
- return true;
- }
-
- /**
- * @return true since this
- */
- @Override
- public boolean inType()
- {
- return true;
- }
-
- /**
- * Will return true since this is an inline tag.
- *
- * @return true since this is an inline tag.
- */
-
- @Override
- public boolean isInlineTag()
- {
- return true;
- }
-
- /**
- * Register this Taglet.
- *
- * @param tagletMap the map to register this tag to.
- */
- public static void register(final Map tagletMap)
- {
- final NativeTaglet tag = new NativeTaglet();
- final Taglet t = (Taglet) tagletMap.get(tag.getName());
- if (t != null)
- {
- tagletMap.remove(tag.getName());
- }
- tagletMap.put(tag.getName(), tag);
- }
-
- /**
- * Given the <code>Tag</code> representation of this custom
- * tag, return its string representation.
- *
- * @param tag the <code>Tag</code> representation of this custom tag.
- */
- @Override
- public String toString(final Tag tag)
- {
- String text= tag.text().trim();
- if(mapping== null)
- {
- mapping= new Properties();
- InputStream in= null;
- try
- {
- URL url;
- try
- {
- url = new URL(System.getProperty("nativetaglet.mapping","file:native-taglet.properties"));
- }
- catch (final MalformedURLException e)
- {
- url = new URL("file:"+System.getProperty("nativetaglet.mapping","file:native-taglet.properties"));
- }
- in= url.openStream();
- mapping.load(in);
- }
- catch (final Exception e)
- {
- System.err.println("[NATIVE TAGLET] Could not read mapping file");
- System.err.println("-->");
- e.printStackTrace(System.err);
- System.err.println("<--");
- System.err.println("[NATIVE TAGLET] !!! NO LINKS WILL BE GENERATED !!!");
- }
- finally
- {
- if(in!=null) try{ in.close(); }catch(final Exception ignore){}
- }
- }
-
- if(mapping!=null)
- {
- // First check to see whether this key exists in the mapping
- String url = mapping.getProperty(text);
- if (url == null) {
- // Try iterating the keySet seeing if we can find a partial match
- // In the OpenGL spec this handles the case of glVertex -> glVertex3f
- for(final Iterator i= mapping.keySet().iterator(); i.hasNext();) {
- final String name= (String) i.next();
- if (hasOpenGLSuffix(text, name)) {
- url = mapping.getProperty(name);
- break;
- }
- }
- }
- if (url != null) {
- url = mapping.getProperty("nativetaglet.baseUrl", "") + url;
- text = "<a href=\"" + url + "\">" + text + "</a>";
- }
- }
- return text;
- }
-
- private static final String[] openGLSuffixes = {
- "b",
- "s",
- "i",
- "f",
- "d",
- "ub",
- "us",
- "ui",
- "bv",
- "sv",
- "iv",
- "fv",
- "dv",
- "ubv",
- "usv",
- "uiv"
- };
- private static boolean hasOpenGLSuffix(final String name,
- final String baseName) {
- if (!name.startsWith(baseName)) {
- return false;
- }
- for (int i = 0; i < openGLSuffixes.length; i++) {
- final String suffix = openGLSuffixes[i];
- if (name.endsWith(suffix)) {
- // First see whether it's a simple concatenation
- if (name.equals(baseName + suffix)) {
- return true;
- }
- // Now chop prefix and suffix off and see whether the
- // resulting is a number
- try {
- final String tmp = name.substring(baseName.length(),
- name.length() - suffix.length());
- if (tmp.length() == 1 &&
- Character.isDigit(tmp.charAt(0))) {
- return true;
- }
- } catch (final IndexOutOfBoundsException e) {
- }
- }
- }
- return false;
- }
-
- /**
- * This method should not be called since arrays of inline tags do not
- * exist. Method {@link #tostring(Tag)} should be used to convert this
- * inline tag to a string.
- *
- * @param tags the array of <code>Tag</code>s representing of this custom tag.
- */
- @Override
- public String toString(final Tag[] tags)
- {
- return null;
- }
-}
--- a/make/build.xml
+++ b/make/build.xml
@@ -466,9 +466,6 @@
<fail message="Requires '${compiler.cfg.id}'" unless="compiler.cfg.id"/>
<fail message="Requires '${linker.cfg.id}'" unless="linker.cfg.id"/>
- <javah destdir="${src.generated.c}" classpath="${classes}" class="com.jogamp.common.os.Platform, com.jogamp.common.nio.PointerBuffer, jogamp.common.jvm.JVMUtil, com.jogamp.common.util.JarUtil, jogamp.common.os.MachineDataInfoRuntime" />
- <javah destdir="${src.generated.c}/Unix" classpath="${classes}" class="jogamp.common.os.UnixDynamicLinkerImpl" />
- <javah destdir="${src.generated.c}/Windows" classpath="${classes}" class="jogamp.common.os.WindowsDynamicLinkerImpl"/>
<echo message="Output lib name = ${output.lib.name} -> ${output.lib.name.os}" />
@@ -746,6 +743,7 @@
<!-- Compile gluegen-rt first -->
<javac destdir="${classes}"
+ nativeHeaderDir="${src.generated.c}"
includeAntRuntime="false"
includes="${gluegen-rt.classes} ${jogamp.common.classes}"
excludes="${gluegen.excludes.all} ${java.part.android}"

View File

@@ -0,0 +1,11 @@
--- a/make/gluegen-cpptasks-base.xml
+++ b/make/gluegen-cpptasks-base.xml
@@ -1316,6 +1316,8 @@
<linker id="linker.cfg.linux.sparc" name="${gcc.compat.compiler}">
</linker>
+
+
<compiler id="linker.cfg.android" name="${gcc.compat.compiler}">
<!-- shall be defined in custom ${gluegen-cpptasks.file} ! -->
</compiler>

View File

@@ -0,0 +1,39 @@
--- a/make/stub_includes/platform/glibc-compat-symbols.h
+++ b/make/stub_includes/platform/glibc-compat-symbols.h
@@ -15,35 +15,7 @@
*
* Check build-in macro definitions via 'gcc -dM -E - < /dev/null'
*/
-#if defined(__linux__) /* Actually we like to test whether we link against GLIBC .. */
- #if defined(__GNUC__)
- #if defined(__aarch64__)
- #define GLIBC_COMPAT_SYMBOL(FFF) __asm__(".symver " #FFF "," #FFF "@GLIBC_2.4");
- #elif defined(__arm__)
- #define GLIBC_COMPAT_SYMBOL(FFF) __asm__(".symver " #FFF "," #FFF "@GLIBC_2.4");
- #elif defined(__amd64__)
- #define GLIBC_COMPAT_SYMBOL(FFF) __asm__(".symver " #FFF "," #FFF "@GLIBC_2.2.5");
- #else
- #define GLIBC_COMPAT_SYMBOL(FFF) __asm__(".symver " #FFF "," #FFF "@GLIBC_2.0");
- #endif /*__amd64__*/
- #elif defined(__clang__)
- #if defined(__aarch64__)
- #define GLIBC_COMPAT_SYMBOL(FFF) asm(".symver " #FFF "," #FFF "@GLIBC_2.4");
- #elif defined(__arm__)
- #define GLIBC_COMPAT_SYMBOL(FFF) asm(".symver " #FFF "," #FFF "@GLIBC_2.4");
- #elif defined(__amd64__)
- #define GLIBC_COMPAT_SYMBOL(FFF) asm(".symver " #FFF "," #FFF "@GLIBC_2.2.5");
- #else
- #define GLIBC_COMPAT_SYMBOL(FFF) asm(".symver " #FFF "," #FFF "@GLIBC_2.0");
- #endif /*__amd64__*/
- #else
- #warning GLIBC_COMPAT_SYMBOL not supported with current compiler on GNU/Linux
- #define GLIBC_COMPAT_SYMBOL(FFF)
- #endif
-#else
- #warning GLIBC_COMPAT_SYMBOL not supported with target OS
- #define GLIBC_COMPAT_SYMBOL(FFF)
-#endif
+#define GLIBC_COMPAT_SYMBOL(FFF)
GLIBC_COMPAT_SYMBOL(memcpy)

View File

@@ -0,0 +1,16 @@
--- a/make/gluegen-cpptasks-base.xml
+++ b/make/gluegen-cpptasks-base.xml
@@ -292,7 +292,12 @@
<os name="Android" />
</condition>
<condition property="isLinux">
- <os name="Linux" />
+ <or>
+ <os name="Linux" />
+ <!-- treat GNU/kFreeBSD or Hurd just as Linux -->
+ <os name="GNU/kFreeBSD" />
+ <os name="GNU" />
+ </or>
</condition>
<condition property="isSolaris">
<os name="SunOS" />

View File

@@ -0,0 +1,207 @@
Description: add support for ppc64el arch.
Author: Gilles Filippini <pini@debian.org>
--- /dev/null
+++ b/make/scripts/make.gluegen.all.linux-ppc64le.sh
@@ -0,0 +1,24 @@
+#! /bin/sh
+
+# -Dc.compiler.debug=true \
+# -Dgluegen.cpptasks.detected.os=true \
+# -DisUnix=true \
+# -DisLinux=true \
+# -DisLinuxX86=true \
+# -DisX11=true \
+
+MACHINE=ppc64le
+ARCH=ppc64el
+TRIPLET=powerpc64le-linux-gnu
+
+export TARGET_PLATFORM_LIBS=/usr/lib/$TRIPLET
+export TARGET_JAVA_LIBS=/usr/lib/jvm/java-7-openjdk-$ARCH/jre/lib/$MACHINE
+
+export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-$MACHINE.xml"
+
+#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
+
+ant \
+ -Drootrel.build=build-linux-$MACHINE \
+ $* 2>&1 | tee make.gluegen.all.linux-$MACHINE.log
--- a/make/gluegen-cpptasks-base.xml
+++ b/make/gluegen-cpptasks-base.xml
@@ -48,6 +48,8 @@
- isLinuxMips
- isLinuxMipsel
- isLinuxPpc
+ - isLinuxPpc64
+ - isLinuxPpc64le
- isLinuxs390
- isLinuxs390x
- isLinuxSparc
@@ -133,6 +135,8 @@
- compiler.cfg.linux.mips
- compiler.cfg.linux.mipsel
- compiler.cfg.linux.ppc
+ - compiler.cfg.linux.ppc64
+ - compiler.cfg.linux.ppc64le
- compiler.cfg.linux.s390
- compiler.cfg.linux.s390x
- compiler.cfg.linux.sparc
@@ -155,6 +159,7 @@
- linker.cfg.linux.mips
- linker.cfg.linux.mipsel
- linker.cfg.linux.ppc
+ - linker.cfg.linux.ppc64le
- linker.cfg.linux.s390
- linker.cfg.linux.s390x
- linker.cfg.linux.sparc
@@ -417,6 +422,24 @@
<condition property="ppc">
<os arch="ppc" />
</condition>
+ <condition property="isLinuxPpc64">
+ <and>
+ <istrue value="${isLinux}" />
+ <os arch="ppc64" />
+ </and>
+ </condition>
+ <condition property="ppc64">
+ <os arch="ppc64" />
+ </condition>
+ <condition property="isLinuxPpc64le">
+ <and>
+ <istrue value="${isLinux}" />
+ <os arch="ppc64le" />
+ </and>
+ </condition>
+ <condition property="ppc64le">
+ <os arch="ppc64le" />
+ </condition>
<condition property="isLinuxs390">
<and>
<istrue value="${isLinux}" />
@@ -601,6 +624,8 @@
<echo message="LinuxMips=${isLinuxMips}" />
<echo message="LinuxMipsel=${isLinuxMipsel}" />
<echo message="LinuxPpc=${isLinuxPpc}" />
+ <echo message="LinuxPpc64=${isLinuxPpc64}" />
+ <echo message="LinuxPpc64le=${isLinuxPpc64le}" />
<echo message="Linuxs390=${isLinuxs390}" />
<echo message="Linuxs390x=${isLinuxs390x}" />
<echo message="LinuxSparc=${isLinuxSparc}" />
@@ -683,6 +708,14 @@
<property name="os.and.arch" value="linux-ppc" />
</target>
+ <target name="gluegen.cpptasks.detect.os.linux.ppc64" unless="gluegen.cpptasks.detected.os.2" if="isLinuxPpc64">
+ <property name="os.and.arch" value="linux-ppc64" />
+ </target>
+
+ <target name="gluegen.cpptasks.detect.os.linux.ppc64le" unless="gluegen.cpptasks.detected.os.2" if="isLinuxPpc64le">
+ <property name="os.and.arch" value="linux-ppc64le" />
+ </target>
+
<target name="gluegen.cpptasks.detect.os.linux.s390" unless="gluegen.cpptasks.detected.os.2" if="isLinuxs390">
<property name="os.and.arch" value="linux-s390" />
</target>
@@ -707,7 +740,7 @@
<property name="os.and.arch" value="android-aarch64" />
</target>
- <target name="gluegen.cpptasks.detect.os.linux" depends="gluegen.cpptasks.detect.os.linux.amd64,gluegen.cpptasks.detect.os.linux.ia64,gluegen.cpptasks.detect.os.linux.x86,gluegen.cpptasks.detect.os.linux.armv6.armel,gluegen.cpptasks.detect.os.linux.armv6.armhf,gluegen.cpptasks.detect.os.android.armv6.armel,gluegen.cpptasks.detect.os.linux.aarch64,gluegen.cpptasks.detect.os.android.armv6.armhf,gluegen.cpptasks.detect.os.android.aarch64,gluegen.cpptasks.detect.os.linux.alpha,gluegen.cpptasks.detect.os.linux.hppa,gluegen.cpptasks.detect.os.linux.mips,gluegen.cpptasks.detect.os.linux.mipsel,gluegen.cpptasks.detect.os.linux.ppc,gluegen.cpptasks.detect.os.linux.s390,gluegen.cpptasks.detect.os.linux.s390x,gluegen.cpptasks.detect.os.linux.sparc" unless="gluegen.cpptasks.detected.os.2" />
+ <target name="gluegen.cpptasks.detect.os.linux" depends="gluegen.cpptasks.detect.os.linux.amd64,gluegen.cpptasks.detect.os.linux.ia64,gluegen.cpptasks.detect.os.linux.x86,gluegen.cpptasks.detect.os.linux.armv6.armel,gluegen.cpptasks.detect.os.linux.armv6.armhf,gluegen.cpptasks.detect.os.android.armv6.armel,gluegen.cpptasks.detect.os.linux.aarch64,gluegen.cpptasks.detect.os.android.armv6.armhf,gluegen.cpptasks.detect.os.android.aarch64,gluegen.cpptasks.detect.os.linux.alpha,gluegen.cpptasks.detect.os.linux.hppa,gluegen.cpptasks.detect.os.linux.mips,gluegen.cpptasks.detect.os.linux.mipsel,gluegen.cpptasks.detect.os.linux.ppc,gluegen.cpptasks.detect.os.linux.ppc64,gluegen.cpptasks.detect.os.linux.ppc64le,gluegen.cpptasks.detect.os.linux.s390,gluegen.cpptasks.detect.os.linux.s390x,gluegen.cpptasks.detect.os.linux.sparc" unless="gluegen.cpptasks.detected.os.2" />
<target name="gluegen.cpptasks.detect.os.osx" unless="gluegen.cpptasks.detected.os.2" if="isOSX">
<property name="native.library.suffix" value="*lib" />
@@ -1268,6 +1301,12 @@
<linker id="linker.cfg.linux.ppc" name="${gcc.compat.compiler}">
</linker>
+ <linker id="linker.cfg.linux.ppc64" name="${gcc.compat.compiler}">
+ </linker>
+
+ <linker id="linker.cfg.linux.ppc64le" name="${gcc.compat.compiler}">
+ </linker>
+
<linker id="linker.cfg.linux.s390" name="${gcc.compat.compiler}">
</linker>
@@ -1505,6 +1544,20 @@
<property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/ppc" />
</target>
+ <target name="gluegen.cpptasks.declare.compiler.linux.ppc64" if="isLinuxPpc64">
+ <echo message="Linux.Ppc64" />
+ <property name="compiler.cfg.id.base" value="compiler.cfg.linux" />
+ <property name="linker.cfg.id.base" value="linker.cfg.linux" />
+ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/ppc64" />
+ </target>
+
+ <target name="gluegen.cpptasks.declare.compiler.linux.ppc64le" if="isLinuxPpc64le">
+ <echo message="Linux.Ppc64le" />
+ <property name="compiler.cfg.id.base" value="compiler.cfg.linux" />
+ <property name="linker.cfg.id.base" value="linker.cfg.linux" />
+ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/ppc64le" />
+ </target>
+
<target name="gluegen.cpptasks.declare.compiler.linux.s390" if="isLinuxs390">
<echo message="Linux.s390" />
<property name="compiler.cfg.id.base" value="compiler.cfg.linux" />
@@ -1526,7 +1579,7 @@
<property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/sparc" />
</target>
- <target name="gluegen.cpptasks.declare.compiler.linux" depends="gluegen.cpptasks.declare.compiler.linux.x86,gluegen.cpptasks.declare.compiler.linux.amd64,gluegen.cpptasks.declare.compiler.linux.ia64,gluegen.cpptasks.declare.compiler.linux.armv6,gluegen.cpptasks.declare.compiler.linux.aarch64,gluegen.cpptasks.declare.compiler.linux.alpha,gluegen.cpptasks.declare.compiler.linux.hppa,gluegen.cpptasks.declare.compiler.linux.mips,gluegen.cpptasks.declare.compiler.linux.mipsel,gluegen.cpptasks.declare.compiler.linux.ppc,gluegen.cpptasks.declare.compiler.linux.s390,gluegen.cpptasks.declare.compiler.linux.s390x,gluegen.cpptasks.declare.compiler.linux.sparc" if="isLinux">
+ <target name="gluegen.cpptasks.declare.compiler.linux" depends="gluegen.cpptasks.declare.compiler.linux.x86,gluegen.cpptasks.declare.compiler.linux.amd64,gluegen.cpptasks.declare.compiler.linux.ia64,gluegen.cpptasks.declare.compiler.linux.armv6,gluegen.cpptasks.declare.compiler.linux.aarch64,gluegen.cpptasks.declare.compiler.linux.alpha,gluegen.cpptasks.declare.compiler.linux.hppa,gluegen.cpptasks.declare.compiler.linux.mips,gluegen.cpptasks.declare.compiler.linux.mipsel,gluegen.cpptasks.declare.compiler.linux.ppc,gluegen.cpptasks.declare.compiler.linux.ppc64,gluegen.cpptasks.declare.compiler.linux.ppc64le,gluegen.cpptasks.declare.compiler.linux.s390,gluegen.cpptasks.declare.compiler.linux.s390x,gluegen.cpptasks.declare.compiler.linux.sparc" if="isLinux">
<property name="java.includes.dir.platform" value="${java.includes.dir}/x11" />
</target>
--- a/src/java/jogamp/common/os/PlatformPropsImpl.java
+++ b/src/java/jogamp/common/os/PlatformPropsImpl.java
@@ -522,6 +522,7 @@ public abstract class PlatformPropsImpl
* <li>linux-aarch64</li>
* <li>linux-amd64</li>
* <li>linux-ppc64</li>
+ * <li>linux-ppc64le</li>
* <li>linux-mips64</li>
* <li>linux-ia64</li>
* <li>linux-sparcv9</li>
@@ -578,7 +579,7 @@ public abstract class PlatformPropsImpl
_and_arch_tmp = "amd64";
break;
case PPC64:
- _and_arch_tmp = "ppc64";
+ _and_arch_tmp = littleEndian ? "ppc64le" : "ppc64";
break;
case MIPS_64:
_and_arch_tmp = "mips64";
--- a/make/build.xml
+++ b/make/build.xml
@@ -306,6 +306,18 @@
<property name="linker.cfg.id" value="linker.cfg.linux.ppc" />
</target>
+ <target name="declare.linux.ppc64" if="isLinuxPpc64">
+ <echo message="Linux.ppc64" />
+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
+ <property name="linker.cfg.id" value="linker.cfg.linux.ppc64" />
+ </target>
+
+ <target name="declare.linux.ppc64le" if="isLinuxPpc64le">
+ <echo message="Linux.ppc64le" />
+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
+ <property name="linker.cfg.id" value="linker.cfg.linux.ppc64le" />
+ </target>
+
<target name="declare.linux.s390" if="isLinuxs390">
<echo message="Linux.s390" />
<property name="compiler.cfg.id" value="compiler.cfg.linux" />
@@ -324,7 +336,7 @@
<property name="linker.cfg.id" value="linker.cfg.linux.sparc" />
</target>
- <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6" if="isLinux" >
+ <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.ppc64,declare.linux.ppc64le,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6" if="isLinux" >
<property name="c.src.dir.os" value="unix" />
</target>

View File

@@ -1,106 +0,0 @@
--- a/make/gluegen-cpptasks-base.xml
+++ b/make/gluegen-cpptasks-base.xml
@@ -1216,21 +1216,12 @@
<!-- Unix linker configuration -->
- <linker id="linker.cfg.linux" name="${gcc.compat.compiler}">
- <linkerarg value="-static-libgcc" if="isGCC"/>
- <linkerarg value="-static-libstdc++" if="isGCC"/>
- </linker>
-
<linker id="linker.cfg.linux.x86" name="${gcc.compat.compiler}">
<linkerarg value="-m32"/>
- <linkerarg value="-static-libgcc" if="isGCC"/>
- <linkerarg value="-static-libstdc++" if="isGCC"/>
</linker>
<linker id="linker.cfg.linux.amd64" name="${gcc.compat.compiler}">
<linkerarg value="-m64"/>
- <linkerarg value="-static-libgcc" if="isGCC"/>
- <linkerarg value="-static-libstdc++" if="isGCC"/>
</linker>
<!-- Using default compiler settings - utilize:
@@ -1241,16 +1232,12 @@
<linkerarg value="-fpic" />
<linkerarg value="-nostdlib" />
<linkerarg value="-Bdynamic" />
- <linkerarg value="-static-libgcc" if="isGCC"/>
- <linkerarg value="-static-libstdc++" if="isGCC"/>
</linker>
<linker id="linker.cfg.linux.aarch64" name="${gcc.compat.compiler}">
<linkerarg value="-fpic" />
<linkerarg value="-nostdlib" />
<linkerarg value="-Bdynamic" />
- <linkerarg value="-static-libgcc" if="isGCC"/>
- <linkerarg value="-static-libstdc++" if="isGCC"/>
</linker>
<linker id="linker.cfg.linux.alpha" name="${gcc.compat.compiler}">
@@ -1296,20 +1283,14 @@
<linker id="linker.cfg.solaris" name="${gcc.compat.compiler}">
<linkerarg value="-m32"/>
- <linkerarg value="-static-libgcc" if="isGCC"/>
- <linkerarg value="-static-libstdc++" if="isGCC"/>
</linker>
<linker id="linker.cfg.solaris.sparcv9" name="${gcc.compat.compiler}">
<linkerarg value="-xarch=v9a" />
- <linkerarg value="-static-libgcc" if="isGCC"/>
- <linkerarg value="-static-libstdc++" if="isGCC"/>
</linker>
<linker id="linker.cfg.solaris.amd64" name="${gcc.compat.compiler}">
<linkerarg value="-m64"/>
- <linkerarg value="-static-libgcc" if="isGCC"/>
- <linkerarg value="-static-libstdc++" if="isGCC"/>
<!-- linkerarg value="-xarch=amd64" / -->
</linker>
@@ -1324,8 +1305,6 @@
<linkerarg value="-arch" if="use.macosx64"/>
<linkerarg value="x86_64" if="use.macosx64"/>
<linkerarg value="-mmacosx-version-min=10.5"/>
- <linkerarg value="-static-libgcc" if="isGCC"/>
- <linkerarg value="-static-libstdc++" if="isGCC"/>
<!-- Note: Apple doesn't seem to provide ppc64 binaries on Leopard -->
</linker>
@@ -1334,16 +1313,12 @@
<!--linker id="linker.cfg.linux64.mingw64" classname="net.sf.antcontrib.cpptasks.gcc.Gcc64Linker"-->
<linker id="linker.cfg.linux64.mingw64" classname="net.sf.antcontrib.cpptasks.gcc.GccLinker">
<linkerarg value="-m64"/>
- <linkerarg value="-static-libgcc" if="isGCC"/>
- <linkerarg value="-static-libstdc++" if="isGCC"/>
</linker>
<!--linker id="linker.cfg.linux64.mingw32" classname="net.sf.antcontrib.cpptasks.gcc.Gcc32Linker"-->
<linker id="linker.cfg.linux64.mingw32" classname="net.sf.antcontrib.cpptasks.gcc.GccLinker">
<linkerarg value="-m32"/>
<linkerarg value="-Wl,--kill-at" /> <!-- remove @ from function names, ie no __stdcall @nn -->
- <linkerarg value="-static-libgcc" if="isGCC"/>
- <linkerarg value="-static-libstdc++" if="isGCC"/>
</linker>
<linker id="linker.cfg.win32.mingw" name="${gcc.compat.compiler}" incremental="false">
@@ -1351,8 +1326,6 @@
<linkerarg value="-Wl,--enable-auto-import"/> <!-- for linking against dll directly -->
<linkerarg value="-Wl,--enable-stdcall-fixup"/> <!-- for linking against dll directly -->
<linkerarg value="-Wl,--kill-at" /> <!-- remove @ from function names, ie no __stdcall @nn -->
- <linkerarg value="-static-libgcc" if="isGCC"/>
- <linkerarg value="-static-libstdc++" if="isGCC"/>
</linker>
<linker id="linker.cfg.win64.mingw" name="${gcc.compat.compiler}" incremental="false">
@@ -1360,8 +1333,6 @@
<linkerarg value="-Wl,--enable-auto-import"/> <!-- for linking against dll directly -->
<linkerarg value="-Wl,--enable-stdcall-fixup"/> <!-- for linking against dll directly -->
<linkerarg value="-Wl,--kill-at" /> <!-- remove @ from function names, ie no __stdcall @nn -->
- <linkerarg value="-static-libgcc" if="isGCC"/>
- <linkerarg value="-static-libstdc++" if="isGCC"/>
</linker>
<linker id="linker.cfg.win32.msvc" name="msvc" incremental="false">

View File

@@ -0,0 +1,67 @@
Description: No longer use rt.jar which is gone since Java 9
Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: no
--- a/make/build.xml
+++ b/make/build.xml
@@ -729,7 +729,6 @@
encoding="UTF-8"
source="${target.sourcelevel}"
target="${target.targetlevel}"
- bootclasspath="${target.rt.jar}"
debug="${javacdebug}" debuglevel="${javacdebuglevel}">
<src path="${src.java}" />
<src path="${src.generated.java}" />
@@ -757,7 +756,6 @@
encoding="UTF-8"
source="${target.sourcelevel}"
target="${target.targetlevel}"
- bootclasspath="${host.rt.jar}"
debug="${javacdebug}" debuglevel="${javacdebuglevel}">
<src path="${src.jcpp}" />
<src path="${src.java}" />
@@ -914,7 +912,6 @@
encoding="UTF-8"
source="${target.sourcelevel}"
target="${target.targetlevel}"
- bootclasspath="${target.rt.jar}"
debug="${javacdebug}" debuglevel="${javacdebuglevel}">
<src path="${src.java}" />
<src path="${src.generated.java}" />
@@ -974,7 +971,6 @@
encoding="UTF-8"
source="${target.sourcelevel}"
target="${target.targetlevel}"
- bootclasspath="${target.rt.jar}"
debug="${javacdebug}" debuglevel="${javacdebuglevel}">
<src path="${src.java}" />
<classpath refid="android.classpath" />
--- a/make/jogamp-env.xml
+++ b/make/jogamp-env.xml
@@ -183,13 +183,6 @@
<echo message="target.sourcelevel ${target.sourcelevel}"/>
<echo message="target.targetlevel ${target.targetlevel}"/>
<echo message="target.rt.jar ${target.rt.jar}"/>
- <fail message="No target.rt.jar specified not found.">
- <condition>
- <not>
- <isset property="target.rt.jar"/>
- </not>
- </condition>
- </fail>
<property name="host.sourcelevel" value="${ant.java.version}" /> <!-- default values for compile time components -->
<property name="host.targetlevel" value="${ant.java.version}" /> <!-- default values for compile time components -->
@@ -206,13 +199,6 @@
<echo message="host.sourcelevel ${host.sourcelevel}"/>
<echo message="host.targetlevel ${host.targetlevel}"/>
<echo message="host.rt.jar ${host.rt.jar}"/>
- <fail message="No host.rt.jar specified not found.">
- <condition>
- <not>
- <isset property="host.rt.jar"/>
- </not>
- </condition>
- </fail>
<fail message="Unsupported Target Java version (sourcelevel): ${target.sourcelevel}. Make sure that the version of the Java compiler is 1.6 (6.0) or greater.">
<condition>

View File

@@ -0,0 +1,138 @@
Description: add support for s390x arch.
Author: Gilles Filippini <pini@debian.org>
--- /dev/null
+++ b/make/scripts/make.gluegen.all.linux-s390x.sh
@@ -0,0 +1,24 @@
+#! /bin/sh
+
+# -Dc.compiler.debug=true \
+# -Dgluegen.cpptasks.detected.os=true \
+# -DisUnix=true \
+# -DisLinux=true \
+# -DisLinuxX86=true \
+# -DisX11=true \
+
+MACHINE=s390x
+ARCH=s390x
+TRIPLET=s390x-linux-gnu
+
+export TARGET_PLATFORM_LIBS=/usr/lib/$TRIPLET
+export TARGET_JAVA_LIBS=/usr/lib/jvm/java-7-openjdk-$ARCH/jre/lib/$MACHINE
+
+export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-$MACHINE.xml"
+
+#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
+
+ant \
+ -Drootrel.build=build-linux-$MACHINE \
+ $* 2>&1 | tee make.gluegen.all.linux-$MACHINE.log
--- a/src/java/jogamp/common/os/PlatformPropsImpl.java
+++ b/src/java/jogamp/common/os/PlatformPropsImpl.java
@@ -527,6 +527,7 @@ public abstract class PlatformPropsImpl
* <li>linux-ia64</li>
* <li>linux-sparcv9</li>
* <li>linux-risc2.0</li>
+ * <li>linux-s390x</li>
* <li>freebsd-i586</li>
* <li>freebsd-amd64</li>
* <li>hpux-hppa</li>
@@ -593,6 +594,9 @@ public abstract class PlatformPropsImpl
case PA_RISC2_0:
_and_arch_tmp = "risc2.0";
break;
+ case S390X:
+ _and_arch_tmp = "s390x";
+ break;
default:
throw new InternalError("Unhandled CPUType: "+cpuType);
}
--- a/src/java/jogamp/common/os/elf/ElfHeaderPart1.java
+++ b/src/java/jogamp/common/os/elf/ElfHeaderPart1.java
@@ -412,6 +412,15 @@ public class ElfHeaderPart1 {
cpuName = "ppc64";
abiType = ABIType.GENERIC_ABI;
break;
+ case EM_S390:
+ // Can be 32 or 64 bits
+ if( 64 == getArchClassBits() ) {
+ cpuName = "s390x";
+ } else {
+ cpuName = "s390";
+ }
+ abiType = ABIType.GENERIC_ABI;
+ break;
case EM_SH:
cpuName = "superh";
abiType = ABIType.GENERIC_ABI;
--- a/src/java/com/jogamp/common/os/Platform.java
+++ b/src/java/com/jogamp/common/os/Platform.java
@@ -77,7 +77,9 @@ public class Platform extends PlatformPr
/** Itanium */
IA64,
/** Hitachi SuperH */
- SuperH;
+ SuperH,
+ /** IBM ESA/390 and zSystems */
+ S390;
}
public enum CPUType {
@@ -118,9 +120,13 @@ public class Platform extends PlatformPr
/** SPARC 64bit, big endian */
SPARCV9_64(CPUFamily.SPARC, false),
/** PA_RISC2_0 64bit, ??? endian */
- PA_RISC2_0(CPUFamily.PA_RISC, false);
+ PA_RISC2_0(CPUFamily.PA_RISC, false),
// 17
+ /** S390X 64bit big endian */
+ S390X(CPUFamily.S390, true);
+ // 18
+
public final CPUFamily family;
public final boolean is32Bit;
@@ -201,6 +207,8 @@ public class Platform extends PlatformPr
return MIPS_32;
} else if( cpuABILower.startsWith("superh") ) {
return SuperH;
+ } else if( cpuABILower.equals("s390x") ) {
+ return S390X;
} else {
throw new RuntimeException("Please port CPUType detection to your platform (CPU_ABI string '" + cpuABILower + "')");
}
--- a/src/java/com/jogamp/common/os/MachineDataInfo.java
+++ b/src/java/com/jogamp/common/os/MachineDataInfo.java
@@ -73,6 +73,7 @@ public class MachineDataInfo {
private final static int[] align_sparc_32_sunos = { 1, 2, 4, 8, 4, 4, 4, 8, 8, 4 };
private final static int[] align_x86_32_windows = { 1, 2, 4, 8, 4, 4, 4, 8, 4, 4 };
private final static int[] align_lp64_unix = { 1, 2, 4, 8, 4, 8, 4, 8, 16, 8 };
+ private final static int[] align_s390_64_unix = { 1, 2, 4, 8, 4, 8, 4, 8, 8, 8 };
private final static int[] align_x86_64_windows = { 1, 2, 4, 8, 4, 4, 4, 8, 16, 8 };
/**
@@ -108,9 +109,11 @@ public class MachineDataInfo {
X86_32_WINDOWS( size_x86_32_windows, align_x86_32_windows),
/** LP64 Unix, e.g.: {@link Platform.CPUType#X86_64} Unix, {@link Platform.CPUType#ARM64} EABI, {@link Platform.CPUType#PPC64} Unix, .. */
LP64_UNIX( size_lp64_unix, align_lp64_unix),
+ /** {@link Platform.CPUType#S390X} Unix */
+ S390_64_UNIX( size_lp64_unix, align_s390_64_unix),
/** {@link Platform.CPUType#X86_64} Windows */
X86_64_WINDOWS( size_x86_64_windows, align_x86_64_windows);
- // 8
+ // 9
public final MachineDataInfo md;
--- a/src/java/jogamp/common/os/MachineDataInfoRuntime.java
+++ b/src/java/jogamp/common/os/MachineDataInfoRuntime.java
@@ -112,6 +112,8 @@ public class MachineDataInfoRuntime {
} else {
if( osType == Platform.OSType.WINDOWS ) {
return StaticConfig.X86_64_WINDOWS;
+ } else if ( Platform.CPUType.S390X == cpuType ) {
+ return StaticConfig.S390_64_UNIX;
} else {
// for all 64bit unix types (x86_64, aarch64, sparcv9, ..)
return StaticConfig.LP64_UNIX;

View File

@@ -0,0 +1,171 @@
Description: enable testcases build and run.
One testcase can't build because of missing up to date semver-java:
- TestVersionSemantics
Three testcases fail on every arch while the library seems functional:
- TestUri99LaunchOnReservedCharPathBug908
- TestStructGen01
- TestStructGen02.
Author: Gilles Filippini <pini@debian.org>
--- gluegen2.orig/make/build-test.xml
+++ gluegen2/make/build-test.xml
@@ -84,6 +84,7 @@
<pathelement location="${junit.jar}" />
<pathelement location="${semver.jar}" />
<pathelement location="${gluegen.jar}" />
+ <pathelement location="/usr/share/java/jsr305.jar" />
</path>
<path id="junit.run.classpath">
--- gluegen2.orig/make/scripts/runtest.sh
+++ gluegen2/make/scripts/runtest.sh
@@ -42,7 +42,7 @@ rm -f $LOG
GLUEGEN_ROOT=`dirname $builddir`
ROOTREL_BUILD=`basename $builddir`
-X_ARGS="-Drootrel.build=$ROOTREL_BUILD -Dgluegen.root=$GLUEGEN_ROOT"
+X_ARGS="-Drootrel.build=$ROOTREL_BUILD -Dgluegen.root=$GLUEGEN_ROOT -Djava.library.path=$builddir/obj:$builddir/test/build/natives"
#D_ARGS="-Djogamp.debug.ProcAddressHelper -Djogamp.debug.NativeLibrary -Djogamp.debug.NativeLibrary.Lookup"
#D_ARGS="-Djogamp.debug.TraceLock"
#D_ARGS="-Djogamp.debug.Platform -Djogamp.debug.NativeLibrary"
@@ -64,12 +64,12 @@ X_ARGS="-Drootrel.build=$ROOTREL_BUILD -
#D_ARGS="-Djogamp.debug.IOUtil -Djogamp.debug.IOUtil.Exe"
#D_ARGS="-Djogamp.debug.ByteBufferInputStream"
#D_ARGS="-Djogamp.debug.Bitstream"
-#D_ARGS="-Djogamp.debug=all"
+D_ARGS="-Djogamp.debug=all"
#D_ARGS="-Djogamp.debug.Logging"
function onetest() {
#USE_CLASSPATH=lib/junit.jar:$ANT_JARS:lib/semantic-versioning/semver.jar:"$builddir"/../make/lib/TestJarsInJar.jar:"$builddir"/gluegen-rt.jar:"$builddir"/gluegen.jar:"$builddir"/gluegen-test-util.jar:"$builddir"/test/build/gluegen-test.jar
- USE_CLASSPATH=lib/junit.jar:$ANT_JARS:lib/semantic-versioning/semver.jar:"$builddir"/../make/lib/TestJarsInJar.jar:"$builddir"/gluegen-rt.jar:"$builddir"/gluegen.jar:"$builddir"/gluegen-test-util.jar:"$builddir"/test/build/gluegen-test.jar:"$builddir"/gluegen-rt-natives.jar
+ USE_CLASSPATH=/usr/share/java/junit4.jar:$ANT_JARS:lib/semantic-versioning/semver.jar:"$builddir"/../test/TestJarsInJar/TestJarsInJar.jar:"$builddir"/gluegen-rt.jar:"$builddir"/gluegen.jar:"$builddir"/gluegen-test-util.jar:"$builddir"/test/build/gluegen-test.jar:"$builddir"/gluegen-rt-natives.jar
#USE_CLASSPATH=lib/junit.jar:$ANT_JARS:lib/semantic-versioning/semver.jar:"$builddir"/../make/lib/TestJarsInJar.jar:"$builddir"/gluegen-rt-alt.jar:"$builddir"/gluegen.jar:"$builddir"/gluegen-test-util.jar:"$builddir"/test/build/gluegen-test.jar
libspath="$builddir"/test/build/natives
#USE_CLASSPATH=lib/junit.jar:$ANT_JARS:"$builddir"/../make/lib/TestJarsInJar.jar:"$builddir"/classes:"$builddir"/test/build/classes
@@ -88,66 +88,68 @@ function onetest() {
echo
}
#
+(cd $builddir/../test/TestJarsInJar && sh make.sh)
+#
-#onetest com.jogamp.common.GlueGenVersion 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.TestSystemPropsAndEnvs 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.TestVersionInfo 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.TestVersionNumber 2>&1 | tee -a $LOG
+onetest com.jogamp.common.GlueGenVersion 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.TestSystemPropsAndEnvs 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.TestVersionInfo 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.TestVersionNumber 2>&1 | tee -a $LOG
#onetest com.jogamp.common.util.TestVersionSemantics 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.TestIteratorIndexCORE 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.locks.TestRecursiveLock01 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.locks.TestRecursiveThreadGroupLock01 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.locks.TestSingletonServerSocket00 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.locks.TestSingletonServerSocket01 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.locks.TestSingletonServerSocket02 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.TestFloatStack01 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.TestIntegerStack01 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.TestArrayHashSet01 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.TestArrayHashMap01 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.IntIntHashMapTest 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.IntObjectHashMapTest 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.LongIntHashMapTest 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.TestPlatform01 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.TestRunnableTask01 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.TestIteratorIndexCORE 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.locks.TestRecursiveLock01 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.locks.TestRecursiveThreadGroupLock01 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.locks.TestSingletonServerSocket00 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.locks.TestSingletonServerSocket01 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.locks.TestSingletonServerSocket02 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.TestFloatStack01 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.TestIntegerStack01 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.TestArrayHashSet01 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.TestArrayHashMap01 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.IntIntHashMapTest 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.IntObjectHashMapTest 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.LongIntHashMapTest 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.TestPlatform01 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.TestRunnableTask01 2>&1 | tee -a $LOG
onetest com.jogamp.common.util.TestIOUtil01 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.TestTempJarCache 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.TestJarUtil 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.TestValueConversion 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.TestSyncRingBuffer01 $*
-#onetest com.jogamp.common.util.TestLFRingBuffer01 $*
-#onetest com.jogamp.common.util.TestBitfield00 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.TestBitstream00 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.TestBitstream01 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.TestBitstream02 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.TestBitstream03 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.TestBitstream04 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.net.TestUrisWithAssetHandler 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.net.TestUriQueryProps 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.net.TestUri01 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.net.TestUri02Composing 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.net.TestUri03Resolving 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.net.TestUri99LaunchOnReservedCharPathBug908 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.net.AssetURLConnectionUnregisteredTest 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.net.AssetURLConnectionRegisteredTest 2>&1 | tee -a $LOG
-#onetest com.jogamp.junit.sec.TestSecIOUtil01 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.nio.BuffersTest 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.nio.TestBuffersFloatDoubleConversion 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.nio.TestPointerBufferEndian 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.nio.TestStructAccessorEndian 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.nio.TestByteBufferInputStream 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.nio.TestByteBufferOutputStream 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.nio.TestByteBufferCopyStream 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.os.TestElfReader01 $* 2>&1 | tee -a $LOG
-#onetest com.jogamp.gluegen.test.junit.internals.TestType 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.TestTempJarCache 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.TestJarUtil 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.TestValueConversion 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.TestSyncRingBuffer01 $*
+onetest com.jogamp.common.util.TestLFRingBuffer01 $*
+onetest com.jogamp.common.util.TestBitfield00 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.TestBitstream00 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.TestBitstream01 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.TestBitstream02 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.TestBitstream03 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.TestBitstream04 2>&1 | tee -a $LOG
+onetest com.jogamp.common.net.TestUrisWithAssetHandler 2>&1 | tee -a $LOG
+onetest com.jogamp.common.net.TestUriQueryProps 2>&1 | tee -a $LOG
+onetest com.jogamp.common.net.TestUri01 2>&1 | tee -a $LOG
+onetest com.jogamp.common.net.TestUri02Composing 2>&1 | tee -a $LOG
+onetest com.jogamp.common.net.TestUri03Resolving 2>&1 | tee -a $LOG
+onetest com.jogamp.common.net.TestUri99LaunchOnReservedCharPathBug908 2>&1 | tee -a $LOG
+onetest com.jogamp.common.net.AssetURLConnectionUnregisteredTest 2>&1 | tee -a $LOG
+onetest com.jogamp.common.net.AssetURLConnectionRegisteredTest 2>&1 | tee -a $LOG
+onetest com.jogamp.junit.sec.TestSecIOUtil01 2>&1 | tee -a $LOG
+onetest com.jogamp.common.nio.BuffersTest 2>&1 | tee -a $LOG
+onetest com.jogamp.common.nio.TestBuffersFloatDoubleConversion 2>&1 | tee -a $LOG
+onetest com.jogamp.common.nio.TestPointerBufferEndian 2>&1 | tee -a $LOG
+onetest com.jogamp.common.nio.TestStructAccessorEndian 2>&1 | tee -a $LOG
+onetest com.jogamp.common.nio.TestByteBufferInputStream 2>&1 | tee -a $LOG
+onetest com.jogamp.common.nio.TestByteBufferOutputStream 2>&1 | tee -a $LOG
+onetest com.jogamp.common.nio.TestByteBufferCopyStream 2>&1 | tee -a $LOG
+onetest com.jogamp.common.os.TestElfReader01 $* 2>&1 | tee -a $LOG
+onetest com.jogamp.gluegen.test.junit.internals.TestType 2>&1 | tee -a $LOG
-#onetest com.jogamp.gluegen.test.junit.generation.PCPPTest 2>&1 | tee -a $LOG
-#onetest com.jogamp.gluegen.jcpp.IncludeAbsoluteTest 2>&1 | tee -a $LOG
-#onetest com.jogamp.gluegen.jcpp.CppReaderTest 2>&1 | tee -a $LOG
-#onetest com.jogamp.gluegen.jcpp.TokenPastingWhitespaceTest 2>&1 | tee -a $LOG
-#onetest com.jogamp.gluegen.jcpp.PreprocessorTest 2>&1 | tee -a $LOG
+onetest com.jogamp.gluegen.test.junit.generation.PCPPTest 2>&1 | tee -a $LOG
+onetest com.jogamp.gluegen.jcpp.IncludeAbsoluteTest 2>&1 | tee -a $LOG
+onetest com.jogamp.gluegen.jcpp.CppReaderTest 2>&1 | tee -a $LOG
+onetest com.jogamp.gluegen.jcpp.TokenPastingWhitespaceTest 2>&1 | tee -a $LOG
+onetest com.jogamp.gluegen.jcpp.PreprocessorTest 2>&1 | tee -a $LOG
-#onetest com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter 2>&1 | tee -a $LOG
-#onetest com.jogamp.gluegen.test.junit.generation.Test1p2ProcAddressEmitter 2>&1 | tee -a $LOG
-#onetest com.jogamp.gluegen.test.junit.generation.Test1p2LoadJNIAndImplLib 2>&1 | tee -a $LOG
-#onetest com.jogamp.gluegen.test.junit.structgen.TestStructGen01 2>&1 | tee -a $LOG
-#onetest com.jogamp.gluegen.test.junit.structgen.TestStructGen02 2>&1 | tee -a $LOG
+onetest com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter 2>&1 | tee -a $LOG
+onetest com.jogamp.gluegen.test.junit.generation.Test1p2ProcAddressEmitter 2>&1 | tee -a $LOG
+onetest com.jogamp.gluegen.test.junit.generation.Test1p2LoadJNIAndImplLib 2>&1 | tee -a $LOG
+onetest com.jogamp.gluegen.test.junit.structgen.TestStructGen01 2>&1 | tee -a $LOG
+onetest com.jogamp.gluegen.test.junit.structgen.TestStructGen02 2>&1 | tee -a $LOG

View File

@@ -4,6 +4,7 @@
EAPI=8
JAVA_PKG_IUSE="doc source test"
WANT_ANT_TASKS="ant-antlr ant-contrib dev-java/cpptasks:0"
inherit java-pkg-2 java-ant-2 toolchain-funcs
@@ -40,26 +41,42 @@ DEPEND="
dev-java/ant-junit4
)
"
BDEPEND="dev-vcs/git"
PATCHES=(
"${FILESDIR}/${PN}-2.3.2-ppc64el-support.diff"
"${FILESDIR}/${PN}-2.3.2-disableArchive7z.diff"
"${FILESDIR}/${PN}-2.3.2-disable-test-zip-archive.diff"
"${FILESDIR}/${PN}-2.3.2-disable_git_call.diff"
"${FILESDIR}/${PN}-2.3.2-linker.diff"
"${FILESDIR}/${PN}-2.3.2-hideException.diff"
"${FILESDIR}/${PN}-2.3.2-armhf.diff"
"${FILESDIR}/${PN}-2.3.2-fix-alpha-build-config.patch"
"${FILESDIR}/${PN}-2.3.2-missing-arch-symbol.diff"
"${FILESDIR}/${PN}-2.3.2-fix-arm64-build-config.diff"
"${FILESDIR}/${PN}-2.3.2-tests.diff"
"${FILESDIR}/${PN}-2.3.2-disable-static-linking.diff"
"${FILESDIR}/${PN}-2.3.2-s390x-support.diff"
"${FILESDIR}/${PN}-2.3.2-non-linux-support.diff"
"${FILESDIR}/${PN}-2.3.2-disable-java-version-check.diff"
"${FILESDIR}/${PN}-2.3.2-rtjar.diff"
"${FILESDIR}/${PN}-2.3.2-add-mips64el-mipsn32-support.diff"
"${FILESDIR}/${PN}-2.3.2-java10-compatibility.patch"
"${FILESDIR}/${PN}-2.3.2-fix_gcc-10.patch"
"${FILESDIR}/${PN}-2.2.4-dont-copy-jars.patch"
"${FILESDIR}/${PN}-2.2.4-dont-strip.patch"
"${FILESDIR}/${PN}-2.2.4-dont-test-archive.patch"
"${FILESDIR}/${P}-remove-static-lib.patch"
"${FILESDIR}/${P}-respect-flags.patch"
"${FILESDIR}/${PN}-2.3.2-respect-flags.patch"
)
EANT_BUILD_TARGET="all.no_junit"
EANT_BUILD_XML="make/build.xml"
EANT_DOC_TARGET=""
EANT_EXTRA_ARGS="-Dc.strip.libraries=false"
EANT_EXTRA_ARGS="-Dc.strip.libraries=false -Dtarget.sourcelevel=1.8 -Dtarget.targetlevel=1.8 -Dtarget.rt.jar= "
EANT_GENTOO_CLASSPATH="antlr,ant-core,jsr305"
EANT_GENTOO_CLASSPATH_EXTRA="${S}/build/${PN}{,-rt}.jar"
EANT_NEEDS_TOOLS="yes"
EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
EANT_TEST_TARGET="junit.run"
JAVA_ANT_REWRITE_CLASSPATH="yes"
WANT_ANT_TASKS="ant-antlr ant-contrib dev-java/cpptasks:0"
src_prepare() {
tc-export CC
@@ -67,13 +84,6 @@ src_prepare() {
rm -rf make/lib || die
default
java-ant_bsfix_files "${S}/make/build-test.xml" "${S}/make/jogamp-env.xml"
#it want a git repo
git init || die
git config --global user.email "you@example.com" || die
git config --global user.name "Your Name" || die
git add . || die
git commit -m 'init' || die
}
src_test() {

View File

@@ -1,2 +1,2 @@
DIST nimbus-0.1.4.tar.gz 24797 BLAKE2B 79efed84fc0e592e3c8275cfc468a041ae460413772a754ea86e97fbb471b2aa49ae1f11d6aa2085853a12381ac9d4b04bff1c8ac9022c2d9e9145e4d2144743 SHA512 6b946d8354f6719eb3ae65aad316cee74f4ddeb275e3de704907f70c7e01df41fa50016b4f444688d72047dd7137e10bb22c5d7fa25f867ecb4300da992e8035
DIST nimbus-0.2.3.tar.gz 25325 BLAKE2B ede807e0d115f2de05956f739939a939c3492410ee5f62b40bbb88f1b7aebb3f5b3ed44d44ee3d1c4ed585f5d51388015a64609c97aa315b30b9cbf62f9b2e58 SHA512 2296de44960570fb371a7a90a50207c2c6cc0ba54e29e324bbe4f8a43b59c356b897e033dafab1eced9d7e76833e351aeb86252ed236a5d15c03a3f8639347c7
DIST nimbus-0.2.4.tar.gz 25808 BLAKE2B 6f51934b41266dd9cf8a1027d76fd37fb717bbc057ab98d5858bcfd86cfde3f0cd9ffce98f1a73a68b063702a1b0e4c0fade5c6f7abd3118f2ceb2564f9187af SHA512 2228993dbb9b174f0b7ed353e34c19f96b970049da42dcc7a7112a63706234543ac19cdf177ce321db4d9093ae83ff98f31bdf5b4cb001a156c2c61c27f3cf1a

View File

@@ -16,10 +16,6 @@ KEYWORDS="~amd64"
RDEPEND="dev-lang/nim"
BDEPEND="${RDEPEND}"
ETESTAMENT_DESELECT=(
tests/installerscript/test_{binary,source,source_whitelist}.nim
)
src_configure() {
nim_gen_config
}

View File

@@ -0,0 +1 @@
DIST packedjson-0.2.2.tar.gz 13748 BLAKE2B 44d8d7b4d9e8e10ea5ba1893185d8bcf0d05d735fb24d9d82618f23c9b6f03a4653ddab32e5059609cd619f358d73972504d7231bc6143d60dd84a875b382bbf SHA512 0e0493e55b8bf05624d0e995afad455e7fcf5018985f397feb9b1cf99830836e760fb91b68ec718c9488bb592ad59556d7f737a415fa75f248455858ed304123

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>cyber+gentoo@sysrq.in</email>
<name>Anna</name>
</maintainer>
<upstream>
<remote-id type="github">Araq/packedjson</remote-id>
</upstream>
</pkgmetadata>

View File

@@ -0,0 +1,24 @@
# Copyright 2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit nimble
DESCRIPTION="an alternative Nim implementation for JSON"
HOMEPAGE="
https://github.com/Araq/packedjson
https://nimble.directory/pkg/packedjson
"
SRC_URI="https://github.com/Araq/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="${PV}"
KEYWORDS="~amd64"
set_package_url "https://github.com/Araq/packedjson"
src_test() {
enim r ${PN}.nim | tee "${T}"/tests.out
grep -q "test failed" "${T}"/tests.out && die "tests failed"
}

1
dev-nim/redpool/Manifest Normal file
View File

@@ -0,0 +1 @@
DIST redpool-0.1.0_p20220120.tar.gz 1571 BLAKE2B 47c01533030464ed52c999381d1e569dec909d000ce126586253b3f9cdc9a188bb92f512e476fc79e9d135ee805e085b9a4c132d98e30b786243e78a37e25104 SHA512 f11b45d986fdd8e05d4d03097aa4b7bf9a07c09692a315cdf4f89f3921470d85443c3c3f47184a24e356bbaa97bcc2ca680562f9118cef6aac149adfb2d22a0f

View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>cyber+gentoo@sysrq.in</email>
<name>Anna</name>
</maintainer>
<upstream>
<remote-id type="github">zedeus/redpool</remote-id>
<bugs-to>https://github.com/zedeus/redpool/issues</bugs-to>
<doc>https://nimble.directory/docs/redpool</doc>
<maintainer>
<email>zedeus@pm.me</email>
<name>Zed</name>
</maintainer>
</upstream>
</pkgmetadata>

View File

@@ -0,0 +1,23 @@
# Copyright 2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit nimble
COMMIT="8b7c1db069797300425037c98b825c5d3316f752"
DESCRIPTION="Simple Redis connection pool"
HOMEPAGE="
https://github.com/zedeus/redpool
https://nimble.directory/pkg/redpool
"
SRC_URI="https://github.com/zedeus/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${PN}-${COMMIT}"
LICENSE="MIT"
SLOT="$(ver_cut 1-3)"
KEYWORDS="~amd64"
RDEPEND="dev-nim/zedeus_redis"
set_package_url "https://github.com/zedeus/redpool"

1
dev-nim/sass/Manifest Normal file
View File

@@ -0,0 +1 @@
DIST sass-0.2.0.tar.gz 4768 BLAKE2B 6dd6d625caa96ed85b513950eb4f28598eb00d37ea7817bf6dcb2d84a2a06c118955ea1ebb07da759a9b28e02d4c0105e612a0832132511bea2a92491c1338d2 SHA512 9f9a57c07403adcf49845e5d1a6812a9889d9823c6b49a89b0cae863cca2810547703680934511ead14e2f1b995418702fb026fa9cc4199d8b764746f30d057a

11
dev-nim/sass/metadata.xml Normal file
View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>cyber+gentoo@sysrq.in</email>
<name>Anna</name>
</maintainer>
<upstream>
<remote-id type="github">dom96/sass</remote-id>
</upstream>
</pkgmetadata>

View File

@@ -0,0 +1,22 @@
# Copyright 2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit nimble
DESCRIPTION="A wrapper for the libsass library"
HOMEPAGE="
https://github.com/dom96/sass
https://nimble.directory/pkg/sass
"
SRC_URI="https://github.com/dom96/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64"
DEPEND="dev-libs/libsass"
RDEPEND="${DEPEND}"
set_package_url "https://github.com/dom96/sass"

View File

@@ -0,0 +1 @@
DIST supersnappy-2.1.3.tar.gz 9618144 BLAKE2B 953087a338a3a6a762e2a1897152d2045088b37346713f819b6606c34bfb1a288ff6d1f1cc3a347465fba8f07c30aa7ea1d790337d61ef542fbb42cd72ea4964 SHA512 96a1e0ad0882e04f407663072794ae6c4623a69a283a741d07ce015cf04083f83628ac7773f0b2891494f72e65a292f3ebea237034139d7b856aaa27ecf05cd9

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>cyber+gentoo@sysrq.in</email>
<name>Anna</name>
</maintainer>
<upstream>
<remote-id type="github">guzba/supersnappy</remote-id>
</upstream>
</pkgmetadata>

View File

@@ -0,0 +1,19 @@
# Copyright 2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit nimble
DESCRIPTION="Nim implementation of Google's Snappy compression"
HOMEPAGE="
https://github.com/guzba/supersnappy
https://nimble.directory/pkg/supersnappy
"
SRC_URI="https://github.com/guzba/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64"
set_package_url "https://github.com/guzba/supersnappy"

View File

@@ -0,0 +1 @@
DIST zedeus_redis-0.3.0_p20211226.tar.gz 14502 BLAKE2B ac88fe57e87bc9718914d8fa1364bd9c7ad52af7f192507fe1ebdb9b37aabdee047a96bc3eaa4763327ed0d65f6b83fa3e182b9717161611ccabd7f85d9dd7de SHA512 b4e0fdbdc9ae5a8cc17cca16db6b18a9832b079f772cb99f80e1147d0c7c65b6c4d6701cefbb6ce765c600035564f6b4d00ddfdfcb65592b9f4628e97d6b6873

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>cyber+gentoo@sysrq.in</email>
<name>Anna</name>
</maintainer>
<upstream>
<remote-id type="github">zedeus/redis</remote-id>
</upstream>
</pkgmetadata>

View File

@@ -0,0 +1,52 @@
# Copyright 2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit nimble
MY_PN="redis"
COMMIT="d0a0e6fb3010015f0cc483ca2e540ace02446570"
DESCRIPTION="Fork of the official redis client for Nim"
HOMEPAGE="https://github.com/zedeus/redis"
SRC_URI="https://github.com/zedeus/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${MY_PN}-${COMMIT}"
LICENSE="MIT"
SLOT="$(ver_cut 1-3)"
KEYWORDS="~amd64"
IUSE="test"
RESTRICT="!test? ( test )"
BDEPEND="test? ( dev-db/redis )"
set_package_url "https://github.com/zedeus/redis"
src_prepare() {
default
mv redis.nimble ${PN}.nimble || die
}
src_test() {
# Tests that don't require redis, currently broken
#enim r tests/tawaitorder.nim
# Tests that require redis
local redis_pid="${T}"/redis.pid
local redis_port=6379
ebegin "Spawning Redis (NOTE: port ${redis_port} must be free)"
"${EPREFIX}"/usr/sbin/redis-server - <<- EOF > /dev/null
daemonize yes
pidfile ${redis_pid}
port ${redis_port}
bind 127.0.0.1
EOF
eend ${?}
nimble_src_test
ebegin "Stopping Redis"
kill "$(<"${redis_pid}")"
eend ${?}
}

1
dev-nim/zippy/Manifest Normal file
View File

@@ -0,0 +1 @@
DIST zippy-0.10.3.tar.gz 53991961 BLAKE2B d22b6f5caf3b551ff19930e801b7234ca1b24336dc07e3f62811c4e3c0dff73f357f931e4ba3483ffed2109132e40b1a7360899ffa230812e8a035645ce4dff2 SHA512 bad6c0aa44f48072c88708954bc406fe28dcda82b72e1df2842465b989b6824d0acd0b33d752cc6d2c6985ddd315851af1907dbb3527a5170943705e2e9a4ded

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>cyber+gentoo@sysrq.in</email>
<name>Anna</name>
</maintainer>
<upstream>
<remote-id type="github">guzba/zippy</remote-id>
</upstream>
</pkgmetadata>

View File

@@ -0,0 +1,19 @@
# Copyright 2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit nimble
DESCRIPTION="Pure Nim implementation of deflate, zlib, gzip and zip"
HOMEPAGE="
https://github.com/guzba/zippy
https://nimble.directory/pkg/zippy
"
SRC_URI="https://github.com/guzba/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="${PV}"
KEYWORDS="~amd64"
set_package_url "https://github.com/guzba/zippy"

View File

@@ -3,7 +3,8 @@
EAPI=8
PYTHON_COMPAT=( pypy3 python3_{8..10} )
PYTHON_COMPAT=( pypy3 python3_{8..11} )
DISTUTILS_USE_PEP517=setuptools
inherit distutils-r1 optfeature
DESCRIPTION="A set of third-party serializers for Betamax"

View File

@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{8..10} )
PYTHON_COMPAT=( python3_{8..11} )
inherit distutils-r1
MY_P="${PN}-${PV/_p/.post}"

View File

@@ -30,7 +30,6 @@ BDEPEND="
dev-python/requests[${PYTHON_USEDEP}]
dev-python/pytest-timeout[${PYTHON_USEDEP}]
dev-python/requests-mock[${PYTHON_USEDEP}]
>=dev-python/trivup-0.8.3[${PYTHON_USEDEP}]
dev-python/protobuf-python[${PYTHON_USEDEP}]
dev-python/jsonschema[${PYTHON_USEDEP}]

View File

@@ -30,7 +30,6 @@ BDEPEND="
dev-python/requests[${PYTHON_USEDEP}]
dev-python/pytest-timeout[${PYTHON_USEDEP}]
dev-python/requests-mock[${PYTHON_USEDEP}]
>=dev-python/trivup-0.8.3[${PYTHON_USEDEP}]
dev-python/protobuf-python[${PYTHON_USEDEP}]
dev-python/jsonschema[${PYTHON_USEDEP}]

View File

@@ -3,7 +3,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{8..10} pypy3 )
PYTHON_COMPAT=( python3_{8..11} pypy3 )
DISTUTILS_USE_PEP517="flit"
inherit distutils-r1

View File

@@ -1 +0,0 @@
DIST preggy-1.4.4.tar.gz 23351 BLAKE2B ed656f848349c0cdb0f44151ded15db1b68b7358a4633417a6889b4be9397dc0de96dbd5f43bb26f748d9cd4f16532f1954f3978690afa9e792ce24fbe942b20 SHA512 6eb6073eb28ba8684f2795c1d9aa93c2a24e50063359a769f7f7d84da2928e25a0ca86d4ac268dce0c2462bbe1a73e76f496325b6175a1218025e15fb7ce4f4c

View File

@@ -1,12 +0,0 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
<upstream>
<remote-id type="github">heynemann/preggy</remote-id>
<remote-id type="pypi">preggy</remote-id>
</upstream>
</pkgmetadata>

View File

@@ -1,32 +0,0 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
DESCRIPTION="preggy is an assertion library for Python. What were you expecting?"
HOMEPAGE="
https://github.com/heynemann/preggy
https://pypi.org/project/preggy/
"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64"
RDEPEND="
dev-python/six[${PYTHON_USEDEP}]
dev-python/unidecode[${PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}"
BDEPEND="
test? (
dev-python/yanc[${PYTHON_USEDEP}]
)
"
distutils_enable_tests nose

View File

@@ -1 +0,0 @@
DIST pyVows-3.0.0-5b0e2a202603c1fc00d1fa0c6134c92c15b7e2b7.tar.gz 41052 BLAKE2B 98a373d4a98cf5416d173fd9c1889a82480a476ad7ccce0895a9a626068f7a3831ce131433ab9f38726c41cd92cb47426bd8ef1d5a4fb9aab7efd9ee7c06face SHA512 bfef76cce283a77cfb1fd4f3e4d9e73da648390f42ce79524151be44693d9c13864aa75411394a2e294eea93820118f08a160a291146fab4f7d23ef5e14de071

View File

@@ -1,12 +0,0 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
<upstream>
<remote-id type="github">heynemann/pyvows</remote-id>
<remote-id type="pypi">pyVows</remote-id>
</upstream>
</pkgmetadata>

View File

@@ -1,34 +0,0 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
COMMIT="5b0e2a202603c1fc00d1fa0c6134c92c15b7e2b7"
PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
DESCRIPTION="Parallel running of tests, code coverage reports, test profiling, and more"
HOMEPAGE="
https://github.com/heynemann/pyvows
https://pypi.org/project/pyVows/
"
SRC_URI="https://github.com/heynemann/${PN}/archive/${COMMIT}.tar.gz -> ${P}-${COMMIT}.tar.gz" # only for 3.0.0
S="${WORKDIR}/${PN,,}-${COMMIT}"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64"
RDEPEND="
>=dev-python/gevent-1.2.2[${PYTHON_USEDEP}]
>=dev-python/preggy-1.3.0[${PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}"
BDEPEND="
test? (
>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
)
"
distutils_enable_tests pytest

View File

@@ -3,7 +3,8 @@
EAPI=8
PYTHON_COMPAT=( python3_{8..10} pypy3 )
PYTHON_COMPAT=( python3_{8..11} pypy3 )
DISTUTILS_USE_PEP517=setuptools
inherit distutils-r1
DESCRIPTION="Python package providing assets from https://github.com/Kozea/pygal.js"

View File

@@ -1 +0,0 @@
DIST pymp4-1.2.0.tar.gz 13969 BLAKE2B ccbf3664a410162662117307add90bc7c8ab060e633c8acf0cf96607d0ad193618af28eba48a467f380af1e39a4ce3596f0da2a341c94e764c8ef9582dd47cb6 SHA512 307b0d454f56eb185abea1213640e888880c505388e3869cc92be462b2d37dd9244e4b23984c535f84791ed067873e1454e7d89b8109763d44b6d3188658aff4

View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
<upstream>
<bugs-to>https://github.com/beardypig/pymp4/issues</bugs-to>
<remote-id type="github">beardypig/pymp4</remote-id>
<remote-id type="pypi">pymp4</remote-id>
</upstream>
</pkgmetadata>

View File

@@ -1,24 +0,0 @@
# Copyright 2020-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
DESCRIPTION="A Python MP4 Parser and toolkit"
HOMEPAGE="
https://github.com/beardypig/pymp4
https://pypi.org/project/pymp4/
"
SRC_URI="https://github.com/beardypig/pymp4/archive/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
LICENSE="Apache-2.0"
SLOT="0"
RDEPEND="dev-python/construct[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}"
distutils_enable_tests pytest

View File

@@ -32,6 +32,11 @@ BDEPEND="
)
"
EPYTEST_DESELECT=(
"pytest_harvest/tests/test_all_raw_with_meta_check.py::test_run_all_tests[test_get_session_results.py]"
"pytest_harvest/tests/test_all_raw_with_meta_check.py::test_run_all_tests[test_get_session_results_indirect_and_noparam.py]"
)
distutils_enable_tests pytest
python_prepare_all() {

View File

@@ -1 +0,0 @@
DIST python_jwt-3d9747df616d209c07bffe2bcf28b42e92a7d8d4.tar.gz 239032 BLAKE2B 2221d0445898ff1fa7737369e6488cf87287b359751113df61f4677bc9a31d3c90790c77bbaa4df08789019bca93c432dca96245ff28fa931557c046bc705f83 SHA512 43896e20bb2104d43b800f86342035d9eea3a0c70175c47d7875fa9b926dbb7c0f2840a68f25bdae5689df1f80198f74a7738c6a5a19d30748d53c1ebac39cf5

View File

@@ -1,22 +0,0 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
<longdescription lang="en">
Module for generating and verifying JSON Web Tokens.
Note: From version 2.0.1 the namespace has changed from jwt to python_jwt, in order to avoid conflict with PyJWT.
Note: Versions 1.0.0 and later fix a vulnerability in JSON Web Token verification so please upgrade if you're using this functionality. The API has changed so you will need to update your application. verify_jwt now requires you to specify which signature algorithms are allowed.
Uses jwcrypto to do the heavy lifting.
Supports RS256, RS384, RS512, PS256, PS384, PS512, HS256, HS384, HS512, ES256, ES384, ES512, ES256K, EdDSA and none signature algorithms.
Unit tests, including tests for interoperability with jose.
Supports Python 2,7 and 3.6+. Note: generate_jwt returns the token as a Unicode string, even on Python 2.7.
</longdescription>
<upstream>
<remote-id type="github">davedoesdev/python-jwt</remote-id>
<remote-id type="pypi">python-jwt</remote-id>
</upstream>
</pkgmetadata>

View File

@@ -1,40 +0,0 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
COMMIT="3d9747df616d209c07bffe2bcf28b42e92a7d8d4"
MYPN="${PN/_/-}"
PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
DESCRIPTION="Python module for generating and verifying JSON Web Tokens"
HOMEPAGE="
https://github.com/davedoesdev/python-jwt
https://pypi.org/project/python-jwt/
"
SRC_URI="https://github.com/davedoesdev/${MYPN}/archive/${COMMIT}.tar.gz -> ${PN}-${COMMIT}.tar.gz"
S="${WORKDIR}/${MYPN}-${COMMIT}"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64"
IUSE="test"
RDEPEND=">=dev-python/jwcrypto-1.0.0[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}"
BDEPEND="
test? (
>=dev-python/coverage-4.0.3[${PYTHON_USEDEP}]
>=dev-python/gevent-1.2.2[${PYTHON_USEDEP}]
>=dev-python/pyVows-3.0.0[${PYTHON_USEDEP}]
>=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
)
"
RESTRICT="!test? ( test )"
python_test() {
"${EPYTHON}" test/run/run_pyvows.py -v test || die
}

View File

@@ -1 +1 @@
DIST sortedcollections-2.1.0.tar.gz 48563 BLAKE2B 5de36155858dc055c9412ff410bd70b489aba292a2956216db95641e10dcb249b98e5c005c4d7c4fd00b25c3315c65b3f43f404737591632ac223a4045b775b5 SHA512 7cb95af1791ab8f8c99847c1b9e0b8c1e7cc7dfe8a9df5db8bb3c96ceb2f15d7351ab4ff081d037d34dbb6c3108f4b575ca22c9e9e911a727d31b9ba3bf975f6
DIST sortedcollections-2.1.0.gh.tar.gz 48563 BLAKE2B 5de36155858dc055c9412ff410bd70b489aba292a2956216db95641e10dcb249b98e5c005c4d7c4fd00b25c3315c65b3f43f404737591632ac223a4045b775b5 SHA512 7cb95af1791ab8f8c99847c1b9e0b8c1e7cc7dfe8a9df5db8bb3c96ceb2f15d7351ab4ff081d037d34dbb6c3108f4b575ca22c9e9e911a727d31b9ba3bf975f6

View File

@@ -3,7 +3,8 @@
EAPI=8
PYTHON_COMPAT=( python3_{8..10} pypy3 )
PYTHON_COMPAT=( python3_{8..11} pypy3 )
DISTUTILS_USE_PEP517=setuptools
inherit distutils-r1
DESCRIPTION="Apache2 licensed Python sorted collections library"
@@ -11,8 +12,8 @@ HOMEPAGE="
https://pypi.org/project/sortedcollections/
https://github.com/grantjenks/python-sortedcollections
"
SRC_URI="https://github.com/grantjenks/python-${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/python-${PN}-${PV}"
SRC_URI="https://github.com/grantjenks/python-${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
S="${WORKDIR}/python-${P}"
LICENSE="Apache-2.0"
SLOT="0"

View File

@@ -1 +1,2 @@
DIST sse-starlette-0.10.3.tar.gz 513991 BLAKE2B 2d3531e1cb5142e3b6b3c843522b9c2b54a416af18a84c2bbcfdf7761b12405dd8660b53ca807cfdd6c3606d1cded762993922fcc84d15092191e6685dd346d5 SHA512 fe1643ac1624be4ef727108465396dfc5c1e298b8a99918dbad4f1e4f766e35a33f900a63fb31e0c45849a2fdc5e3b3fae9e749413f2431ec554db3db128357a
DIST sse-starlette-0.9.0.tar.gz 511176 BLAKE2B 0ff4cffb60c585af99d70c8fa710b342323b03e1fb9a52af63d5c43b41f49fa2ef71a78355d6677d8e89ab3ecc80ce75cc0a10a4cc48c728b82deec2acab027a SHA512 bca27f1bca8ac864af24dc03f3f49765d8249940583036830ccc805289a7b87f8dcf1c159af308c4e94b85641d8af50c6236be55eaa802bca9d02c7d5cead50d

View File

@@ -0,0 +1,29 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
DISTUTILS_USE_PEP517=setuptools
inherit distutils-r1
DESCRIPTION="Server Sent Events for Starlette"
HOMEPAGE="
https://pypi.org/project/sse-starlette/
https://github.com/sysid/sse-starlette
"
SRC_URI="https://github.com/sysid/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
RDEPEND="dev-python/starlette[${PYTHON_USEDEP}]"
BDEPEND="
test? (
dev-python/pytest-asyncio[${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
)
"
distutils_enable_tests pytest

View File

@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{8..10} pypy3 )
PYTHON_COMPAT=( python3_{8..11} pypy3 )
inherit distutils-r1
DESCRIPTION="Accessible themes for Pygments"

View File

@@ -1 +0,0 @@
DIST trivup-0.10.0.gh.tar.gz 194500 BLAKE2B 46e9f50e1602f270aab5720d205a3d16882a5c7fcf342913083a9172b86f97346b8a7d33267d666734c476f2c7ef7d2618a3fa234fbf1cd559ae614766e1c425 SHA512 8598280e3a38dee85c46d52e688dc2e146bc5ffcede678326af661ac9fd09f7719d6b892a7d264b94d147e0b02f117eca8472898d479bdc4a64b521c2807262a

View File

@@ -1,28 +0,0 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
<longdescription lang="en">
trivup is a flexible, pluggable, light-weight, partly naiivistic, framework for trivially bringing up a cluster of applications.
The initial use-case is to bring up a simple Kafka cluster for easily testing librdkafka on different broker versions.
Featured apps:
Apache Kafka cluster with optional KRaft (ZooKeeper-less) support
Apache ZooKeeper
Confluent's Schema-Registry
Kerberos 5 KDC for GSSAPI/Kerberos authentication
OAUTHBEARER OIDC JWK ticket server
SSL CA/public/private certificate generation
SECURITY WARNING: trivup will run unprotected, wide-open, poorly-configured, server applications on your machine, providing an ingress vector for intrusion, theft and data-loss. DO NOT RUN ON PUBLIC NETWORKS.
</longdescription>
<upstream>
<remote-id type="github">edenhill/trivup</remote-id>
<remote-id type="pypi">trivup</remote-id>
</upstream>
</pkgmetadata>

View File

@@ -1,30 +0,0 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
DESCRIPTION="Trivially Up a cluster of applications"
HOMEPAGE="
https://github.com/edenhill/trivup
https://pypi.org/project/trivup/
"
SRC_URI="https://github.com/edenhill/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
LICENSE="BSD-2"
SLOT="0"
KEYWORDS="~amd64"
RDEPEND="
dev-python/requests[${PYTHON_USEDEP}]
dev-python/jwcrypto[${PYTHON_USEDEP}]
dev-python/python_jwt[${PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}"
RESTRICT="test" # tests try to download and install kafka
distutils_enable_tests pytest

View File

@@ -10,7 +10,7 @@ DOCS_DEPEND="
"
DOCS_DIR="${S}/docs/source"
DOCS_BUILDER="sphinx"
PYTHON_COMPAT=( python3_{8..10} )
PYTHON_COMPAT=( python3_{8..11} )
inherit distutils-r1 docs

View File

@@ -1,10 +1,10 @@
# Copyright 2012-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{8..10} )
EAPI=8
PYTHON_COMPAT=( python3_{8..11} )
DISTUTILS_USE_PEP517=setuptools
inherit distutils-r1
DESCRIPTION="Read JUnit/XUnit XML files and map them to Python objects"
@@ -14,7 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
distutils_enable_tests unittest

View File

@@ -1 +0,0 @@
DIST yanc-0.3.3.tar.gz 16600 BLAKE2B 3a84943f59f60a153b7e76825c047f4a20779125f83a5b20c253cd24909d99e6aeb67bc870fd36b9f853edd7c9770b9e0b687dc868464c5a569242ae0140552a SHA512 8c19f6490b44aaa3745b9c0048e0a8fdd7081691815bede0399b1a2a313fa62697bfba526bb1bcb41078f4d1375208c494c89879a3111a8749ef70928ea2bf4a

View File

@@ -1,12 +0,0 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>lssndrbarbieri@gmail.com</email>
<name>Alessandro Barbieri</name>
</maintainer>
<upstream>
<remote-id type="github">0compute/yanc</remote-id>
<remote-id type="pypi">yanc</remote-id>
</upstream>
</pkgmetadata>

View File

@@ -1,24 +0,0 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
DESCRIPTION="Yet another nose colorer"
HOMEPAGE="
https://github.com/0compute/yanc
https://pypi.org/project/yanc/
"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64"
RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}"
distutils_enable_tests nose

View File

@@ -3,7 +3,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{9..10} )
PYTHON_COMPAT=( python3_{9..11} )
inherit meson python-single-r1

View File

@@ -3,7 +3,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{9..10} )
PYTHON_COMPAT=( python3_{9..11} )
inherit meson python-single-r1

View File

@@ -1,2 +1 @@
DIST pmbootstrap-1.43.1.tar.gz 225811 BLAKE2B d8e5d74510692f65e1430be9d813c23c95c4e8b44212c21ef01747264333a59cb158fb7f03866ca28d907b2d9ab927bfa9dd347bed7462fab6c64b03b9a629cf SHA512 96ba36dba211eacca44afae2c7009fc3e784e0067547406f9640eda311e3331adc54a81ebecefdf3238096e7a156dd3e56fc5b2864c28810c0526ab3efb64c15
DIST pmbootstrap-1.44.1.tar.gz 225898 BLAKE2B 0dd8ea621c7ece8cd7f331d06dd85bde6b38c08bcadd8b0bc6d364855bef7204007988d79992b4ecc8d15e89f1f3917aa0104e81f93ab88e62392da6c96a0bcc SHA512 05499bea2d880f7c8ec3e4bf87b819186448eb99855989d88dc7fa320c71b142461e0679d6089cb06cd3f3b887da389e924d03b20e5f9c339b1ef7610b37b2cf
DIST pmbootstrap-1.45.0.tar.gz 226591 BLAKE2B 163c10102fab1c700d493bad7a007ebb2feed83f99ee9faba8ef71f1aab9ebbe6a8f2ff19d181ba01a1b121d31e36f32b20dd6ce4b9d408ec5eddc9f90b998c7 SHA512 7e62bed9350a54ea875bed6c17c7070b87900589e0db89b865baa0a5d7d211a439f308cf5b544f896d58cb4439bb1ce424e9d42defeb8ec7b14308f62a0529bf

View File

@@ -1,35 +0,0 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{8,9,10} )
inherit python-r1 distutils-r1 linux-info
DESCRIPTION="Helper tool for developing and building postmarketOS"
HOMEPAGE="https://postmarketos.org/"
SRC_URI="https://files.pythonhosted.org/packages/6d/40/b345af67f4784083510735bfa821233daa61029dfb024aac5479d9be8ee6/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
# According to upstream README either x86, amd64 or arm64 are required. I
# wrote down all other arches because if I just did -* without adding x86 and
# arm64 keywords it would seem like the package only works on amd64, but I can't
# keyword x86 and arm64 because I can't test these.
KEYWORDS="-alpha ~amd64 -arm -hppa -ia64 -ppc -ppc64 -riscv -sparc"
# Tests are disabled because they require the pmaports repository (containing
# postmarketOS APKBUILDs) to be cloned at runtime.
RESTRICT="mirror test"
DEPEND="${PYTHON_DEPS}"
RDEPEND="${DEPEND}
dev-vcs/git"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
pkg_pretend() {
if kernel_is -lt 3 17 0; then
eerror "pmbootstrap requires Linux 3.17 or greater."
die
fi
}

View File

@@ -3,7 +3,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{9..10} )
PYTHON_COMPAT=( python3_{9..11} )
DISTUTILS_USE_PEP517=poetry
inherit distutils-r1

View File

@@ -1,2 +1,2 @@
DIST got-portable-0.70.tar.gz 726825 BLAKE2B 63bc71246635fbbc00abd050e2f0f137664fa69cf43def964bc0073732cf89a48182d3bde747f7ec6c77e93f6c5e9b7820d22ba2130f7d4b4857c1f36f20ed8e SHA512 3f4b83964cf26dae717af653213bd698900b604d901bbcc1b382d73a7e6e3601eab233729d0be738cb624a970d2805256fbece5d7669ffb8f7be40fe3eabf8a1
DIST got-portable-0.71.tar.gz 736740 BLAKE2B f9788490881ae2b32b72139358f8bdd965b6c6c80009385db969d0305b3b5649feb4469048f247fbab1a7dcca1dd557165977af2a302ab31641e19328d1d8e2b SHA512 c48932b981ac6cc784fcc6e64b7d4a492840db43c6f0aec355474400ad3df0ea34620c0d4cf543b3583abb6f3908b6381752a235306b34cf81b00749ae19ada4
DIST got-portable-0.73.tar.gz 753204 BLAKE2B 577d4439002adf457a683509f77120f294bbfd75af38c8bee9aaefc9be7538c572956a3c00e7b1bff97f9908107e2f0edbf1d38dff9443dde24c7380d528ac25 SHA512 5cc4dde718910d5b44e238759673ede1b8f6630f801321ced0df0a4b8ff38afca1e77adb8c667f4c74f3e3c8949e460c089951380b54fd231e5b0c7aec03f36e

View File

@@ -73,9 +73,11 @@ etestament() {
if [[ ${ETESTAMENT_DESELECT} ]]; then
local skipfile="${T}"/testament.skipfile
for t in "${ETESTAMENT_DESELECT[@]}"; do
echo "${t}" >> "${skipfile}"
done
if [[ ! -f ${skipfile} ]]; then
for t in "${ETESTAMENT_DESELECT[@]}"; do
echo "${t}" >> "${skipfile}"
done
fi
testament_args+=( --skipFrom:"${skipfile}" )
fi

View File

@@ -134,10 +134,12 @@ nimble_src_configure() {
local nimbusargs=(
--nimbleDir:"${EPREFIX}"/opt/nimble
--binDir:"${EPREFIX}"/usr/bin
--url:"$(get_package_url)"
"${mynimargs[@]}"
)
[[ -n "$(get_package_url)" ]] && \
nimbusargs+=( --url:"$(get_package_url)" )
set -- nimbus "${nimbusargs[@]}" "${S}" "${BUILD_DIR}"
echo "${@}" >&2
"${@}" || die "${*} failed"

View File

@@ -19,13 +19,7 @@ esac
if [[ ! ${_QBS_ECLASS} ]]; then
inherit multiprocessing toolchain-funcs qmake-utils
fi
EXPORT_FUNCTIONS src_configure src_compile src_install
if [[ ! ${_QBS_ECLASS} ]]; then
inherit flag-o-matic multiprocessing toolchain-funcs qmake-utils
# @ECLASS_VARIABLE: QBS_COMMAND_ECHO_MODE
# @USER_VARIABLE
@@ -42,7 +36,10 @@ if [[ ! ${_QBS_ECLASS} ]]; then
# - command-line-with-environment
: ${QBS_COMMAND_ECHO_MODE:=command-line}
BDEPEND="dev-util/qbs"
BDEPEND="
dev-util/meson-format-array
dev-util/qbs
"
# @FUNCTION: eqbs
# @USAGE: [<qbs args>...]
@@ -64,31 +61,7 @@ eqbs() {
# @USAGE: [<flags>...]
# @RETURN: arguments quoted and separated by comma
_flags_to_js_array() {
if [[ ! ${@} ]]; then
echo "[]"
else
local -a array
printf -v array "'%s', " "${@}"
echo "[${array%, }]"
fi
}
# @FUNCTION: _filter_ldflags
# @INTERNAL
# @USAGE: [<ldflags>...]
# @RETURN: flags for the linker (with -Wl and -Xlinker removed)
_filter_ldflags() {
local -a flags
while [[ ${@} ]]; do
if [[ ${1} == -Wl,* ]]; then
IFS=, read -ra flags <<< "${1#-Wl,}"
printf "%s " "${flags[@]}"
elif [[ ${1} == -Xlinker ]]; then
shift
printf "%s " "${1}"
fi
shift
done
meson-format-array "${@}" || die
}
# @FUNCTION: qbs_src_configure
@@ -121,7 +94,7 @@ qbs_src_configure() {
qbs_config cpp.cFlags "$(_flags_to_js_array ${CFLAGS})"
qbs_config cpp.cppFlags "$(_flags_to_js_array ${CPPFLAGS})"
qbs_config cpp.cxxFlags "$(_flags_to_js_array ${CXXFLAGS})"
qbs_config cpp.linkerFlags "$(_flags_to_js_array $(_filter_ldflags ${LDFLAGS}))"
qbs_config cpp.linkerFlags "$(_flags_to_js_array $(raw-ldflags))"
}
# @FUNCTION: qbs_config
@@ -188,3 +161,5 @@ qbs_src_install() {
_QBS_ECLASS=1
fi
EXPORT_FUNCTIONS src_configure src_compile src_install

View File

@@ -32,6 +32,7 @@ x11-themes/hicolor-icon-theme
DEPEND="${RDEPEND}"
BDEPEND="
virtual/pkgconfig
app-arch/zip
app-arch/unzip
media-gfx/imagemagick[jpeg,png]
"

Some files were not shown because too many files have changed in this diff Show More