anydesk-6.1.1 added (6.2.0 hangs)

master
Kolan Sh 2022-09-07 16:20:03 +03:00
parent e1b770804e
commit 9b737b9b48
11 changed files with 801 additions and 0 deletions

View File

@ -0,0 +1 @@
DIST anydesk-6.1.1-amd64.tar.gz 5296860 SHA256 102e72c75502a4779083320322dd047e2b0c00a25ead7444a00aad1db54325aa SHA512 435828660c44437441ab3f5c61783d29f772a958e6b465f24b880014faf120c51dc06a4c1da11bb383be99f9fc1f1f35994ea3a990fc0e94bc18fe26bf95958e WHIRLPOOL 0617f69af7846fa05bf44e69f13de99d76b79ce8ff4a57dcb5a446e1384c3906963d0790a60025090e8e5fd818db8a894d208764a12c2b653eac61d34c0dd543

View File

@ -0,0 +1,118 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit desktop eutils systemd xdg-utils
DESCRIPTION="Feature rich multi-platform remote desktop application"
HOMEPAGE="https://anydesk.com"
SRC_URI="
https://download.anydesk.com/linux/${P}-amd64.tar.gz
https://download.anydesk.com/linux/generic-linux/${P}-amd64.tar.gz
"
# OpeSSL/SSLeay, libvpx, zlib, Xiph, xxHash
LICENSE="AnyDesk-TOS BSD BSD-2 openssl ZLIB"
SLOT="0"
KEYWORDS="-* ~amd64"
BDEPEND=(
">=dev-util/patchelf-0.10"
)
RDEPEND="
dev-libs/atk
dev-libs/glib:2
media-libs/fontconfig:1.0
media-libs/freetype:2
media-libs/glu
media-libs/mesa[X(+)]
sys-auth/polkit
x11-libs/cairo
x11-libs/gdk-pixbuf:2
x11-libs/gtk+:2
x11-libs/gtkglext
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
x11-libs/libxcb
x11-libs/libXdamage
x11-libs/libXext
x11-libs/libXfixes
x11-libs/libXi
x11-libs/libxkbfile
x11-libs/libXmu
x11-libs/libXrandr
x11-libs/libXrender
x11-libs/libXt
x11-libs/libXtst
x11-libs/pango
"
RESTRICT="bindist mirror"
QA_PREBUILT="opt/${PN}/*"
src_install() {
local dst="/opt/${PN}"
## removing dynamik linkage of pangox
patchelf --remove-needed libpangox-1.0.so.0 ${PN}
dodir ${dst}
exeinto ${dst}
doexe ${PN}
dodir /opt/bin
dosym ${dst}/${PN} /opt/bin/${PN}
newinitd "${FILESDIR}"/anydesk.init anydesk
systemd_newunit "${FILESDIR}"/anydesk.service anydesk.service
insinto /usr/share/polkit-1/actions
doins polkit-1/com.anydesk.anydesk.policy
insinto /usr/share
doins -r icons
domenu "${FILESDIR}"/anydesk.desktop
keepdir /etc/${PN}
dodoc copyright README
}
pkg_postinst() {
xdg_desktop_database_update
xdg_icon_cache_update
if [[ -z ${REPLACING_VERSIONS} ]]; then
elog "To run AnyDesk as background service use:"
elog
elog "OpenRC:"
elog "# rc-service anydesk start"
elog "# rc-update add anydesk default"
elog
elog "Systemd:"
elog "# systemctl start anydesk.service"
elog "# systemctl enable anydesk.service"
elog
elog "Please see README at /usr/share/doc/${PF}/README.bz2 for"
elog "further information about the linux version of AnyDesk."
elog
fi
elog "For querying information about the host PC AnyDesk calls"
elog "the following commands. Feel free to install them, but it"
elog "should run without as well."
elog
optfeature "lsb_release" sys-apps/lsb-release
optfeature "lspci" sys-apps/pciutils
optfeature "lsusb" sys-apps/usbutils
}
pkg_postrm() {
xdg_desktop_database_update
xdg_icon_cache_update
}

View File

@ -0,0 +1,12 @@
[Desktop Entry]
Type=Application
Name=AnyDesk
GenericName=AnyDesk
X-GNOME-FullName=AnyDesk
Exec=env GTK2_RC_FILES= GTK_DATA_PREFIX= GTK_THEME=Adwaita /opt/bin/anydesk %u
Icon=anydesk
Terminal=false
TryExec=anydesk
Categories=Network;GTK;
MimeType=x-scheme-handler/anydesk;
Name[de_DE]=AnyDesk

View File

@ -0,0 +1,10 @@
#!/sbin/openrc-run
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
name="AnyDesk service"
description="AnyDesk global service"
command="/opt/bin/anydesk"
command_args="--service"
pidfile="/var/run/anydesk.pid"
command_background=true

View File

@ -0,0 +1,16 @@
[Unit]
Description=AnyDesk
Requires=network.target
After=systemd-user-sessions.service
[Service]
Type=simple
ExecStart=/opt/bin/anydesk --service
PIDFile=/var/run/anydesk.pid
KillMode=mixed
TimeoutStopSec=30
User=root
LimitNOFILE=100000
[Install]
WantedBy=multi-user.target

View File

@ -6,3 +6,4 @@ app-emulation/playonlinux
<sci-geosciences/googleearth-8
games-misc/games-envd
=x11-misc/gcolor2-0.4-r4
=x11-libs/gtkglext-1.2.0-r5 # anydesk

View File

@ -0,0 +1 @@
DIST gtkglext-1.2.0.tar.bz2 703821 SHA256 16bd736074f6b14180f206b7e91263fc721b49912ea3258ab5f094cfa5497f51 SHA512 c5452b7594195da3c1428dc3021a041d70bb8079a514b7310fe7b66f638748ad2399adead36047b52b60b033757581e72f0532c0301e033019bf909f7365071d WHIRLPOOL 2be1308abd4a73a838942ab9fac4d733239b4fe5ba0b50f542510be24088d6697868d2d900b77f8c8e973efd46a5fbb4d2ffd53c7aea8a07d9326bf276908c4f

View File

@ -0,0 +1,34 @@
From 1fe275cd7dfa9f3a6db771b0cb945d96787e72cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@fedoraproject.org>
Date: Thu, 15 Mar 2018 15:56:20 +0100
Subject: [PATCH 2/2] GCC-8 fixes.
---
gdk/gdkglshapes.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gdk/gdkglshapes.c b/gdk/gdkglshapes.c
index f72abba..9d1197f 100644
--- a/gdk/gdkglshapes.c
+++ b/gdk/gdkglshapes.c
@@ -544,7 +544,7 @@ static GLfloat idata[12][3] =
{-Z, -X, 0}
};
-static int index[20][3] =
+static int iindex[20][3] =
{
{0, 4, 1},
{0, 9, 4},
@@ -574,7 +574,7 @@ icosahedron(GLenum shadeType)
int i;
for (i = 19; i >= 0; i--) {
- drawtriangle(i, idata, index, shadeType);
+ drawtriangle(i, idata, iindex, shadeType);
}
}
--
2.14.3

View File

@ -0,0 +1,362 @@
Fix broken multilib gl and glu detection
https://bugs.gentoo.org/543050
https://bugs.gentoo.org/578482
--- gtkglext-1.2.0/configure.in
+++ gtkglext-1.2.0/configure.in
@@ -139,6 +139,7 @@
AC_ISC_POSIX
#AM_DISABLE_STATIC
AC_LIBTOOL_WIN32_DLL
+AC_PROG_CXX
AC_PROG_LIBTOOL
platform_win32=no
@@ -502,275 +503,59 @@
# Checks for OpenGL
##################################################
-GL_CFLAGS=""
-GL_LDFLAGS=""
-GL_LIBS=""
-
-AC_ARG_WITH([gl-prefix],
- [AC_HELP_STRING([--with-gl-prefix=DIR],
- [OpenGL (Mesa) is installed in DIR [default=auto]])], ,
- [with_gl_prefix=auto])
-
-AC_ARG_WITH([gl-includedir],
- [AC_HELP_STRING([--with-gl-includedir=DIR],
- [OpenGL (Mesa) headers are in DIR [default=auto]])], ,
- [with_gl_includedir=auto])
-
-AC_ARG_WITH([gl-libdir],
- [AC_HELP_STRING([--with-gl-libdir=DIR],
- [OpenGL (Mesa) libraries are in DIR [default=auto]])], ,
- [with_gl_libdir=auto])
-
-if test "x$with_gl_includedir" != "xauto"; then
- GL_CFLAGS="-I$with_gl_includedir"
-elif test "x$with_gl_prefix" != "xauto"; then
- GL_CFLAGS="-I$with_gl_prefix/include"
-fi
-
-if test "x$with_gl_libdir" != "xauto"; then
- GL_LDFLAGS="-L$with_gl_libdir"
-elif test "x$with_gl_prefix" != "xauto"; then
- GL_LDFLAGS="-L$with_gl_prefix/lib"
-fi
-
-save_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $GL_CFLAGS $WINDOWING_CFLAGS"
-save_LIBS="$LIBS"
-LIBS="$LIBS $GL_LDFLAGS $WINDOWING_LIBS $MATH_LIB"
-
if test "x$gdktarget" = "xx11"; then
- AC_CHECK_HEADERS([GL/glx.h], ,
- [AC_MSG_ERROR([Cannot find GLX header])])
+ with_gl=x
fi
-AC_CHECK_HEADERS([GL/gl.h GL/glu.h], ,
- [AC_MSG_ERROR([Cannot find OpenGL headers])])
-
-if test "x$gdktarget" = "xx11"; then
-
- # for X11
-
- THREAD_LIB="-lpthread"
- STDCXX_LIB="-lstdc++"
-
- have_GL=no
- GL_LIB_NAME=GL
-
- # GLcore and GL (SGI)
- AC_CHECK_LIB([GLcore], [glVertex3d],
- [GL_LIBS="-lGLcore"])
- if test "x$ac_cv_lib_GLcore_glVertex3d" = "xyes" ; then
- # if GLcore found, then also check for GL
- AC_CHECK_LIB([GL], [glXCreateContext],
- [GL_LIBS="-lGL $GL_LIBS"
- have_GL=yes])
- fi
-
- # GL
- if test "x$have_GL" = "xno" ; then
- # if no GLcore and GL, check for GL
- AC_CHECK_LIB([GL], [glVertex3d],
- [GL_LIBS="-lGL"
- have_GL=yes])
- if test "x$ac_cv_lib_GL_glVertex3d" = "xno" ; then
- # GL may need to be linked with the thread library explicitly
- AC_CHECK_LIB([GL], [glVertex3f],
- [GL_LIBS="-lGL $THREAD_LIB"
- have_GL=yes], ,
- [$THREAD_LIB])
- if test "x$ac_cv_lib_GL_glVertex3f" = "xno" ; then
- # GL may need to be linked with std C++ library explicitly
- AC_CHECK_LIB([GL], [glVertex3i],
- [GL_LIBS="-lGL $STDCXX_LIB"
- have_GL=yes], ,
- [$STDCXX_LIB])
- if test "x$ac_cv_lib_GL_glVertex3i" = "xno" ; then
- # GL may need to be linked with std C++ and thread libraries explicitly
- AC_CHECK_LIB([GL], [glVertex3s],
- [GL_LIBS="-lGL $STDCXX_LIB $THREAD_LIB"
- have_GL=yes], ,
- [$STDCXX_LIB $THREAD_LIB])
- fi
- fi
- fi
- fi
-
- # MesaGL
- if test "x$have_GL" = "xno" ; then
- # if no GL, check for MesaGL
- AC_CHECK_LIB([MesaGL], [glVertex3d],
- [GL_LIBS="-lMesaGL"
- have_GL=yes
- GL_LIB_NAME=MesaGL])
- fi
-
- if test "x$have_GL" = "xno" ; then
- # no GL found
- AC_MSG_ERROR([Cannot find GL library])
- fi
-
- # GLU
-
- have_GLU=no
- have_SGI_GLU=no
-
- AC_CHECK_LIB([GLU], [gluSphere],
- [GL_LIBS="-lGLU $GL_LIBS"
- have_GLU=yes], ,
- [$GL_LIBS])
- if test "x$ac_cv_lib_GLU_gluSphere" = "xno" ; then
- # GLU may need to be linked with the thread library explicitly
- AC_CHECK_LIB([GLU], [gluCylinder],
- [GL_LIBS="-lGLU $GL_LIBS $THREAD_LIB"
- have_GLU=yes], ,
- [$GL_LIBS $THREAD_LIB])
- if test "x$ac_cv_lib_GLU_gluCylinder" = "xno" ; then
- # GLU may need to be linked with std C++ library explicitly
- AC_CHECK_LIB([GLU], [gluDisk],
- [GL_LIBS="-lGLU $GL_LIBS $STDCXX_LIB"
- have_GLU=yes
- have_SGI_GLU=yes], ,
- [$GL_LIBS $STDCXX_LIB])
- if test "x$ac_cv_lib_GLU_gluDisk" = "xno" ; then
- # GLU may need to be linked with std C++ and thread libraries explicitly
- AC_CHECK_LIB([GLU], [gluPartialDisk],
- [GL_LIBS="-lGLU $GL_LIBS $STDCXX_LIB $THREAD_LIB"
- have_GLU=yes
- have_SGI_GLU=yes], ,
- [$GL_LIBS $STDCXX_LIB $THREAD_LIB])
- fi
- fi
- fi
-
- if test "x$have_GLU" = "xno" ; then
- # if no GLU, check for MesaGLU
- AC_CHECK_LIB([MesaGLU], [gluSphere],
- [GL_LIBS="-lMesaGLU $GL_LIBS"
- have_GLU=yes], ,
- [$GL_LIBS])
- fi
-
- if test "x$have_GLU" = "xno" ; then
- # no GLU found
- AC_MSG_ERROR([Cannot find GLU library])
- fi
-
- # Checks for SGI's GLU library
- if test "x$have_SGI_GLU" = "xno" ; then
- # Try static linking
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
-
- AC_CHECK_LIB([GLU], [gluBeginCurve],
- [have_SGI_GLU=no], ,
- [$GL_LIBS])
- if test "x$ac_cv_lib_GLU_gluBeginCurve" = "xno" ; then
- AC_CHECK_LIB([GLU], [gluBeginPolygon],
- [GL_LIBS="$GL_LIBS $STDCXX_LIB"
- have_SGI_GLU=yes], ,
- [$GL_LIBS $STDCXX_LIB])
- fi
-
- LDFLAGS="$save_LDFLAGS"
- fi
-
- AC_MSG_CHECKING([whether libGLU needs to be linked with the std C++ library])
- AC_MSG_RESULT([$have_SGI_GLU])
-
- # Checks for some types in gdk/GL/glxext.h
-
- # GLXFBConfigSGIX
- GDKGLEXT_NEED_GLXFBCONFIGSGIX_TYPEDEF=no
- AC_CHECK_TYPES([GLXFBConfigSGIX], , ,
- [#include <GL/glx.h>])
- if test "x$ac_cv_type_GLXFBConfigSGIX" = "xno" ; then
- GDKGLEXT_NEED_GLXFBCONFIGSGIX_TYPEDEF=yes
- fi
-
- # GLXFBConfigIDSGIX
- GDKGLEXT_NEED_GLXFBCONFIGIDSGIX_TYPEDEF=no
- AC_CHECK_TYPES([GLXFBConfigIDSGIX], , ,
- [#include <GL/glx.h>])
- if test "x$ac_cv_type_GLXFBConfigIDSGIX" = "xno" ; then
- GDKGLEXT_NEED_GLXFBCONFIGIDSGIX_TYPEDEF=yes
- fi
-
- # GLXPbufferSGIX
- GDKGLEXT_NEED_GLXPBUFFERSGIX_TYPEDEF=no
- AC_CHECK_TYPES([GLXPbufferSGIX], , ,
- [#include <GL/glx.h>])
- if test "x$ac_cv_type_GLXPbufferSGIX" = "xno" ; then
- GDKGLEXT_NEED_GLXPBUFFERSGIX_TYPEDEF=yes
- fi
-
- # GLXVideoSourceSGIX
- GDKGLEXT_NEED_GLXVIDEOSOURCESGIX_TYPEDEF=no
- AC_CHECK_TYPES([GLXVideoSourceSGIX], , ,
- [#include <GL/glx.h>])
- if test "x$ac_cv_type_GLXVideoSourceSGIX" = "xno" ; then
- GDKGLEXT_NEED_GLXVIDEOSOURCESGIX_TYPEDEF=yes
- fi
-
- # __GLXextFuncPtr
- GDKGLEXT_NEED_GLXEXTFUNCPTR_TYPEDEF=no
- AC_CHECK_TYPES([__GLXextFuncPtr], , ,
- [#include <GL/glx.h>])
- if test "x$ac_cv_type___GLXextFuncPtr" = "xno" ; then
- GDKGLEXT_NEED_GLXEXTFUNCPTR_TYPEDEF=yes
- fi
-
-else
-
- # for Win32
-
- AC_MSG_CHECKING([for glNewList in -lopengl32])
- have_opengl32=no
- LIBS="-lopengl32 $LIBS"
- AC_TRY_LINK([#include <windows.h>
- #include <GL/gl.h>],
- [glVertex3d(0.0, 0.0, 0.0);],
- [GL_LIBS="-lopengl32"
- have_opengl32=yes])
- AC_MSG_RESULT([$have_opengl32])
- if test "x$have_opengl32" = "xno" ; then
- AC_MSG_ERROR([Cannot find GL library])
- fi
-
- AC_MSG_CHECKING([for gluNewQuadric in -lglu32])
- have_glu32=no
- LIBS="-lglu32 $LIBS"
- AC_TRY_LINK([#include <windows.h>
- #include <GL/gl.h>
- #include <GL/glu.h>],
- [gluNewQuadric();],
- [GL_LIBS="-lglu32 $GL_LIBS"
- have_glu32=yes])
- AC_MSG_RESULT([$have_glu32])
- if test "x$have_glu32" = "xno" ; then
- AC_MSG_ERROR([Cannot find GLU library])
- fi
-
-dnl AC_CHECK_LIB(opengl32, glNewList,
-dnl GL_LIBS="-lopengl32",
-dnl AC_MSG_ERROR(Cannot find GL library))
-
-dnl AC_CHECK_LIB(glu32, gluNewQuadric,
-dnl GL_LIBS="-lglu32 $GL_LIBS",
-dnl AC_MSG_ERROR(Cannot find GLU library),
-dnl $GL_LIBS)
-
+AX_CHECK_GL
+AS_IF([test X$no_gl = Xyes],
+ [AC_MSG_FAILURE([OpenGL is required.])])
+AX_CHECK_GLU
+# FIXME: AX_CHECK_GLU's behavior diverges from common autoconf conventions
+AM_CONDITIONAL([GLU],[test "$no_glu" != yes])
+
+# Checks for some types in gdk/GL/glxext.h
+
+# GLXFBConfigSGIX
+GDKGLEXT_NEED_GLXFBCONFIGSGIX_TYPEDEF=no
+AC_CHECK_TYPES([GLXFBConfigSGIX], , ,
+ [#include <GL/glx.h>])
+if test "x$ac_cv_type_GLXFBConfigSGIX" = "xno" ; then
+ GDKGLEXT_NEED_GLXFBCONFIGSGIX_TYPEDEF=yes
+fi
+
+# GLXFBConfigIDSGIX
+GDKGLEXT_NEED_GLXFBCONFIGIDSGIX_TYPEDEF=no
+AC_CHECK_TYPES([GLXFBConfigIDSGIX], , ,
+ [#include <GL/glx.h>])
+if test "x$ac_cv_type_GLXFBConfigIDSGIX" = "xno" ; then
+ GDKGLEXT_NEED_GLXFBCONFIGIDSGIX_TYPEDEF=yes
+fi
+
+# GLXPbufferSGIX
+GDKGLEXT_NEED_GLXPBUFFERSGIX_TYPEDEF=no
+AC_CHECK_TYPES([GLXPbufferSGIX], , ,
+ [#include <GL/glx.h>])
+if test "x$ac_cv_type_GLXPbufferSGIX" = "xno" ; then
+ GDKGLEXT_NEED_GLXPBUFFERSGIX_TYPEDEF=yes
+fi
+
+# GLXVideoSourceSGIX
+GDKGLEXT_NEED_GLXVIDEOSOURCESGIX_TYPEDEF=no
+AC_CHECK_TYPES([GLXVideoSourceSGIX], , ,
+ [#include <GL/glx.h>])
+if test "x$ac_cv_type_GLXVideoSourceSGIX" = "xno" ; then
+ GDKGLEXT_NEED_GLXVIDEOSOURCESGIX_TYPEDEF=yes
+fi
+
+# __GLXextFuncPtr
+GDKGLEXT_NEED_GLXEXTFUNCPTR_TYPEDEF=no
+AC_CHECK_TYPES([__GLXextFuncPtr], , ,
+ [#include <GL/glx.h>])
+if test "x$ac_cv_type___GLXextFuncPtr" = "xno" ; then
+ GDKGLEXT_NEED_GLXEXTFUNCPTR_TYPEDEF=yes
fi
-dnl # if using mesa, check for xmesa.h
-dnl if test "x$ac_cv_lib_MesaGL_glNewList" = "xyes" ; then
-dnl AC_CHECK_HEADERS([GL/xmesa.h])
-dnl AM_CONDITIONAL(ENABLE_XMESA_FX, \
-dnl test "x$ac_cv_header_GL_xmesa_h" = "xyes")
-dnl else
-dnl # force a failed check
-dnl AM_CONDITIONAL(ENABLE_XMESA_FX, test "no" = "yes")
-dnl fi
-
# Checks for typedefs in gdk/GL/glext.h
# GLhalfNV
@@ -781,22 +566,13 @@
GDKGLEXT_NEED_GLHALFNV_TYPEDEF=yes
fi
-GL_LIBS="$GL_LDFLAGS $GL_LIBS"
-
-AC_SUBST([GL_CFLAGS])
-AC_SUBST([GL_LIBS])
-
-CPPFLAGS="$save_CPPFLAGS"
-LIBS="$save_LIBS"
-
-
##################################################
# CFLAGS and LIBS
##################################################
GDKGLEXT_PACKAGES="gdk_pkg pango_pkg pangox_pkg gmodule_pkg"
GDKGLEXT_EXTRA_CFLAGS="$GL_CFLAGS $GDKGLEXT_WIN_CFLAGS"
-GDKGLEXT_EXTRA_LIBS="$GL_LIBS $GDKGLEXT_WIN_LIBS"
+GDKGLEXT_EXTRA_LIBS="$GL_LIBS $GLU_LIBS $GDKGLEXT_WIN_LIBS"
GDKGLEXT_DEP_CFLAGS="$GDKGLEXT_EXTRA_CFLAGS `$PKG_CONFIG --cflags $GDKGLEXT_PACKAGES`"
GDKGLEXT_DEP_LIBS="$GDKGLEXT_EXTRA_LIBS `$PKG_CONFIG --libs $GDKGLEXT_PACKAGES` $MATH_LIB"
AC_SUBST([GDKGLEXT_PACKAGES])

View File

@ -0,0 +1,184 @@
diff -up gtkglext-1.2.0/configure.in.nopangox gtkglext-1.2.0/configure.in
--- gtkglext-1.2.0/configure.in.nopangox 2006-02-04 22:17:19.000000000 -0500
+++ gtkglext-1.2.0/configure.in 2020-07-13 15:52:42.616448758 -0400
@@ -59,10 +59,6 @@ m4_define([gmodule_required_version], [2
m4_define([pango_pkg], [pango])
m4_define([pango_required_version], [1.0.0])
-# Pangox
-m4_define([pangox_pkg], [pangox])
-m4_define([pangox_required_version], [1.0.0])
-
# PangoFT2
m4_define([pangoft2_pkg], [pangoft2])
m4_define([pangoft2_required_version], [1.0.0])
@@ -349,7 +345,6 @@ PKG_CHECK_MODULES([BASE_DEPENDENCIES], [
gtk_pkg >= gtk_required_version \
gdk_pkg >= gdk_required_version \
pango_pkg >= pango_required_version \
-pangox_pkg >= pangox_required_version \
gmodule_pkg >= gmodule_required_version \
])
@@ -794,7 +789,7 @@ LIBS="$save_LIBS"
# CFLAGS and LIBS
##################################################
-GDKGLEXT_PACKAGES="gdk_pkg pango_pkg pangox_pkg gmodule_pkg"
+GDKGLEXT_PACKAGES="gdk_pkg pango_pkg gmodule_pkg"
GDKGLEXT_EXTRA_CFLAGS="$GL_CFLAGS $GDKGLEXT_WIN_CFLAGS"
GDKGLEXT_EXTRA_LIBS="$GL_LIBS $GDKGLEXT_WIN_LIBS"
GDKGLEXT_DEP_CFLAGS="$GDKGLEXT_EXTRA_CFLAGS `$PKG_CONFIG --cflags $GDKGLEXT_PACKAGES`"
diff -up gtkglext-1.2.0/configure.nopangox gtkglext-1.2.0/configure
--- gtkglext-1.2.0/configure.nopangox 2006-02-04 22:17:47.000000000 -0500
+++ gtkglext-1.2.0/configure 2020-07-13 15:52:42.619448711 -0400
@@ -19880,14 +19880,12 @@ if test -n "$PKG_CONFIG"; then
gtk+-2.0 >= 2.0.0 \\
gdk-2.0 >= 2.0.0 \\
pango >= 1.0.0 \\
-pangox >= 1.0.0 \\
gmodule-2.0 >= 2.0.0 \\
\"") >&5
($PKG_CONFIG --exists --print-errors "\
gtk+-2.0 >= 2.0.0 \
gdk-2.0 >= 2.0.0 \
pango >= 1.0.0 \
-pangox >= 1.0.0 \
gmodule-2.0 >= 2.0.0 \
") 2>&5
ac_status=$?
@@ -19897,7 +19895,6 @@ gmodule-2.0 >= 2.0.0 \
gtk+-2.0 >= 2.0.0 \
gdk-2.0 >= 2.0.0 \
pango >= 1.0.0 \
-pangox >= 1.0.0 \
gmodule-2.0 >= 2.0.0 \
" 2>/dev/null`
else
@@ -19916,14 +19913,12 @@ if test -n "$PKG_CONFIG"; then
gtk+-2.0 >= 2.0.0 \\
gdk-2.0 >= 2.0.0 \\
pango >= 1.0.0 \\
-pangox >= 1.0.0 \\
gmodule-2.0 >= 2.0.0 \\
\"") >&5
($PKG_CONFIG --exists --print-errors "\
gtk+-2.0 >= 2.0.0 \
gdk-2.0 >= 2.0.0 \
pango >= 1.0.0 \
-pangox >= 1.0.0 \
gmodule-2.0 >= 2.0.0 \
") 2>&5
ac_status=$?
@@ -19933,7 +19928,6 @@ gmodule-2.0 >= 2.0.0 \
gtk+-2.0 >= 2.0.0 \
gdk-2.0 >= 2.0.0 \
pango >= 1.0.0 \
-pangox >= 1.0.0 \
gmodule-2.0 >= 2.0.0 \
" 2>/dev/null`
else
@@ -19958,7 +19952,6 @@ fi
gtk+-2.0 >= 2.0.0 \
gdk-2.0 >= 2.0.0 \
pango >= 1.0.0 \
-pangox >= 1.0.0 \
gmodule-2.0 >= 2.0.0 \
"`
else
@@ -19966,7 +19959,6 @@ gmodule-2.0 >= 2.0.0 \
gtk+-2.0 >= 2.0.0 \
gdk-2.0 >= 2.0.0 \
pango >= 1.0.0 \
-pangox >= 1.0.0 \
gmodule-2.0 >= 2.0.0 \
"`
fi
@@ -19977,7 +19969,6 @@ gmodule-2.0 >= 2.0.0 \
gtk+-2.0 >= 2.0.0 \
gdk-2.0 >= 2.0.0 \
pango >= 1.0.0 \
-pangox >= 1.0.0 \
gmodule-2.0 >= 2.0.0 \
) were not met:
@@ -19994,7 +19985,6 @@ echo "$as_me: error: Package requirement
gtk+-2.0 >= 2.0.0 \
gdk-2.0 >= 2.0.0 \
pango >= 1.0.0 \
-pangox >= 1.0.0 \
gmodule-2.0 >= 2.0.0 \
) were not met:
@@ -25420,7 +25410,7 @@ LIBS="$save_LIBS"
# CFLAGS and LIBS
##################################################
-GDKGLEXT_PACKAGES="gdk-2.0 pango pangox gmodule-2.0"
+GDKGLEXT_PACKAGES="gdk-2.0 pango gmodule-2.0"
GDKGLEXT_EXTRA_CFLAGS="$GL_CFLAGS $GDKGLEXT_WIN_CFLAGS"
GDKGLEXT_EXTRA_LIBS="$GL_LIBS $GDKGLEXT_WIN_LIBS"
GDKGLEXT_DEP_CFLAGS="$GDKGLEXT_EXTRA_CFLAGS `$PKG_CONFIG --cflags $GDKGLEXT_PACKAGES`"
diff -up gtkglext-1.2.0/gdk/x11/gdkglfont-x11.c.nopangox gtkglext-1.2.0/gdk/x11/gdkglfont-x11.c
--- gtkglext-1.2.0/gdk/x11/gdkglfont-x11.c.nopangox 2004-02-20 04:38:14.000000000 -0500
+++ gtkglext-1.2.0/gdk/x11/gdkglfont-x11.c 2020-07-13 15:55:19.720973082 -0400
@@ -18,7 +18,8 @@
#include <string.h>
-#include <pango/pangox.h>
+//#include <pango/pangox.h>
+#include <pango/pangocairo.h>
#include "gdkglx.h"
#include "gdkglprivate-x11.h"
@@ -77,9 +78,9 @@ gdk_gl_font_use_pango_font_common (Pango
{
PangoFont *font = NULL;
gchar *charset = NULL;
- PangoXSubfont subfont_id;
+ //PangoXSubfont subfont_id;
gchar *xlfd = NULL;
- PangoXFontCache *font_cache;
+ //PangoXFontCache *font_cache;
XFontStruct *fs;
GDK_GL_NOTE_FUNC_PRIVATE ();
@@ -91,6 +92,7 @@ gdk_gl_font_use_pango_font_common (Pango
goto FAIL;
}
+ /*
charset = gdk_gl_font_charset_for_locale ();
if (!pango_x_find_first_subfont (font, &charset, 1, &subfont_id))
{
@@ -114,6 +116,7 @@ gdk_gl_font_use_pango_font_common (Pango
glXUseXFont (fs->fid, first, count, list_base);
pango_x_font_cache_unload (font_cache, fs);
+ */
FAIL:
@@ -149,11 +152,7 @@ gdk_gl_font_use_pango_font (const PangoF
GDK_GL_NOTE_FUNC ();
-#ifdef GDKGLEXT_MULTIHEAD_SUPPORT
- font_map = pango_x_font_map_for_display (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
-#else /* GDKGLEXT_MULTIHEAD_SUPPORT */
- font_map = pango_x_font_map_for_display (gdk_x11_get_default_xdisplay ());
-#endif /* GDKGLEXT_MULTIHEAD_SUPPORT */
+ font_map = pango_cairo_font_map_get_default ();
return gdk_gl_font_use_pango_font_common (font_map, font_desc,
first, count, list_base);
@@ -187,7 +186,7 @@ gdk_gl_font_use_pango_font_for_display (
GDK_GL_NOTE_FUNC ();
- font_map = pango_x_font_map_for_display (GDK_DISPLAY_XDISPLAY (display));
+ font_map = pango_cairo_font_map_get_default ();
return gdk_gl_font_use_pango_font_common (font_map, font_desc,
first, count, list_base);

View File

@ -0,0 +1,62 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit autotools gnome2 multilib-minimal
DESCRIPTION="GL extensions for Gtk+ 2.0"
HOMEPAGE="http://gtkglext.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="
>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
>=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}]
>=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}]
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
"
DEPEND="${RDEPEND}
dev-util/glib-utils
>=sys-devel/autoconf-archive-2014.02.28
virtual/pkgconfig
"
src_prepare() {
# Fix build issues with gcc patch from Fedora, bug #649718
eapply "${FILESDIR}"/${P}-gcc8-fixes.patch
# Ancient configure.in with broken multilib gl detection (bug #543050)
# Backport some configure updates from upstream git master to fix
eapply "${FILESDIR}"/${P}-gl-configure.patch
# Drop pangox-compat dep with patch from Fedora, bugs #698950, #706344
eapply "${FILESDIR}"/${P}-no-pangox.patch
mv configure.{in,ac} || die "mv failed"
eautoreconf
gnome2_src_prepare
}
multilib_src_configure() {
ECONF_SOURCE=${S} \
gnome2_src_configure \
--disable-static
}
multilib_src_install() {
gnome2_src_install
}
multilib_src_install_all() {
local DOCS=( AUTHORS ChangeLog{,.pre-1-0} NEWS README TODO )
einstalldocs
}