Răsfoiți Sursa

x11vnc: mark as broken

Waldemar Brodkorb 3 luni în urmă
părinte
comite
f020105103

+ 5 - 7
package/x11vnc/Makefile

@@ -4,18 +4,19 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		x11vnc
-PKG_VERSION:=		0.9.16
+PKG_VERSION:=		0.9.17
 PKG_RELEASE:=		1
-PKG_HASH:=		885e5b5f5f25eec6f9e4a1e8be3d0ac71a686331ee1cfb442dba391111bd32bd
+PKG_HASH:=		3ab47c042bc1c33f00c7e9273ab674665b85ab10592a8e0425589fe7f3eb1a69
 PKG_DESCR:=		vnc server for x11 displays
 PKG_SECTION:=		x11/apps
 PKG_DEPENDS:=		libvncserver libpng libjpeg-turbo zlib liblzo
 PKG_DEPENDS+=		libgnutls libxi libxdamage libxtst cairo
 PKG_DEPENDS+=		libxfixes libxrandr
 PKG_BUILDDEP:=		libX11 libXtst libjpeg-turbo libvncserver
-PKG_URL:=		http://www.karlrunge.com/x11vnc/
 PKG_SITES:=		https://github.com/LibVNC/x11vnc/archive/refs/tags/
 
+PKG_CFLINE_X11VNC:=	depends on ADK_BROKEN
+
 DISTFILES:=		${PKG_VERSION}.tar.gz
 
 include $(ADK_TOPDIR)/mk/package.mk
@@ -23,15 +24,12 @@ include $(ADK_TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,X11VNC,x11vnc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 TARGET_LDFLAGS+=	-lssl -lcrypto
-ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y)
-MAKE_FLAGS+=		CFLAGS="${TARGET_CFLAGS} -static" \
-			LIBS="-lxcb -lXau -lXdmcp -ldl -pthread -ljpeg -lz"
-endif
 
 AUTOTOOL_STYLE:=	autoreconf
 CONFIGURE_ARGS+=	--without-ssl \
 			--without-crypto
 
+
 x11vnc-install:
 	$(INSTALL_DIR) $(IDIR_X11VNC)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/x11vnc \

+ 0 - 12
package/x11vnc/patches/patch-src_util_c

@@ -1,12 +0,0 @@
---- x11vnc-0.9.16.orig/src/util.c	2019-01-05 14:22:11.000000000 +0100
-+++ x11vnc-0.9.16/src/util.c	2022-12-30 16:45:15.602697333 +0100
-@@ -47,6 +47,9 @@ int hxl = 0;
- #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
- MUTEX(x11Mutex);
- MUTEX(scrollMutex);
-+MUTEX(clientMutex);
-+MUTEX(inputMutex);
-+MUTEX(pointerMutex);
- #endif
- 
- int nfix(int i, int n);

+ 0 - 15
package/x11vnc/patches/patch-src_util_h

@@ -1,15 +0,0 @@
---- x11vnc-0.9.16.orig/src/util.h	2019-01-05 14:22:11.000000000 +0100
-+++ x11vnc-0.9.16/src/util.h	2022-12-30 16:45:15.598697256 +0100
-@@ -102,9 +102,9 @@ extern struct timeval _mysleep;
- #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
- extern MUTEX(x11Mutex);
- extern MUTEX(scrollMutex);
--MUTEX(clientMutex);
--MUTEX(inputMutex);
--MUTEX(pointerMutex);
-+extern MUTEX(clientMutex);
-+extern MUTEX(inputMutex);
-+extern MUTEX(pointerMutex);
- #endif
- 
- #define X_INIT INIT_MUTEX(x11Mutex)