pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

uTox-git: Switch to uTox/uTox repository

Module Name:	pkgsrc-wip
Committed By:	Mateusz Poszwa <old4%o2.pl@localhost>
Pushed By:	f8l
Date:		Tue Jan 10 00:00:52 2017 +0100
Changeset:	b7e4151920ff96c95c4a9a79904885f68fb73fb6

Modified Files:
	uTox-git/Makefile
	uTox-git/PLIST
	uTox-git/distinfo
	uTox-git/patches/patch-src_xlib_main.c
	uTox-git/patches/patch-src_xlib_video.c
Added Files:
	uTox-git/patches/patch-src_xlib_CMakeLists.txt
Removed Files:
	uTox-git/patches/patch-Makefile

Log Message:
uTox-git: Switch to uTox/uTox repository

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b7e4151920ff96c95c4a9a79904885f68fb73fb6

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 uTox-git/Makefile                              |  9 ++--
 uTox-git/PLIST                                 | 15 ------
 uTox-git/distinfo                              |  6 +--
 uTox-git/patches/patch-Makefile                | 65 --------------------------
 uTox-git/patches/patch-src_xlib_CMakeLists.txt | 17 +++++++
 uTox-git/patches/patch-src_xlib_main.c         | 17 ++++---
 uTox-git/patches/patch-src_xlib_video.c        | 12 ++---
 7 files changed, 38 insertions(+), 103 deletions(-)

diffs:
diff --git a/uTox-git/Makefile b/uTox-git/Makefile
index e132bf3..50480af 100644
--- a/uTox-git/Makefile
+++ b/uTox-git/Makefile
@@ -1,11 +1,11 @@
 # $NetBSD$
 
-DISTNAME=	uTox-0.9.8
+DISTNAME=	uTox-0.11.1
 CATEGORIES=	chat
-MASTER_SITES=	${MASTER_SITE_GITHUB:=GrayHatter/}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=uTox/}
 
 GIT_REPOSITORIES=	uTox
-GIT_REPO.uTox=	http://github.com/GrayHatter/uTox.git
+GIT_REPO.uTox=	http://github.com/uTox/uTox.git
 WRKSRC=	${WRKDIR}/uTox
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
@@ -13,8 +13,7 @@ HOMEPAGE=	http://utox.org/
 COMMENT=	Lightweight Tox client for the desktop
 LICENSE=	gnu-gpl-v3
 
-NO_CONFIGURE=	yes
-USE_TOOLS+=	gmake pkg-config
+USE_CMAKE=	yes
 
 .include "../../wip/toxcore-git/buildlink3.mk"
 .include "../../wip/filter_audio-git/buildlink3.mk"
diff --git a/uTox-git/PLIST b/uTox-git/PLIST
index a96d9b8..1ae9c62 100644
--- a/uTox-git/PLIST
+++ b/uTox-git/PLIST
@@ -2,18 +2,3 @@
 bin/utox
 man/man1/utox.1
 share/applications/utox.desktop
-share/icons/hicolor/128x128/apps/utox.png
-share/icons/hicolor/14x14/apps/utox.png
-share/icons/hicolor/16x16/apps/utox.png
-share/icons/hicolor/192x192/apps/utox.png
-share/icons/hicolor/22x22/apps/utox.png
-share/icons/hicolor/24x24/apps/utox.png
-share/icons/hicolor/256x256/apps/utox.png
-share/icons/hicolor/32x32/apps/utox.png
-share/icons/hicolor/36x36/apps/utox.png
-share/icons/hicolor/48x48/apps/utox.png
-share/icons/hicolor/512x512/apps/utox.png
-share/icons/hicolor/64x64/apps/utox.png
-share/icons/hicolor/72x72/apps/utox.png
-share/icons/hicolor/96x96/apps/utox.png
-share/icons/hicolor/scalable/apps/utox.svg
diff --git a/uTox-git/distinfo b/uTox-git/distinfo
index 5258acb..ff913c9 100644
--- a/uTox-git/distinfo
+++ b/uTox-git/distinfo
@@ -1,7 +1,7 @@
 $NetBSD$
 
-SHA1 (patch-Makefile) = 054a4c9f38462312c14930ef176f8f645bc1680c
 SHA1 (patch-src_main.h) = 1def46cb26e474b20a5e34ae5a471a7c9fbb004c
-SHA1 (patch-src_xlib_main.c) = 9ec90c640dd7603634593b3e00cba6714c955901
+SHA1 (patch-src_xlib_CMakeLists.txt) = c9cfe396d16a8b236e36fe50dd3b5b200fac93ad
+SHA1 (patch-src_xlib_main.c) = 842a929eb691fc2dcf8d6817a6837fdad7222985
 SHA1 (patch-src_xlib_v4l.c) = 159ac6e676c0361262daeb3f5324e4916b09b16a
-SHA1 (patch-src_xlib_video.c) = 4154194ba0d1a28f89a7bca9ce4004cc6064bdd1
+SHA1 (patch-src_xlib_video.c) = e8a036070322af80736fb7789de3a2dbdeb86d45
diff --git a/uTox-git/patches/patch-Makefile b/uTox-git/patches/patch-Makefile
deleted file mode 100644
index 37998cb..0000000
--- a/uTox-git/patches/patch-Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-$NetBSD$
-
-Treat non-Cygwin platforms similarly.
-Use dl library only on Linux.
-Allow separate destination for manuals.
-
---- Makefile.orig	2016-08-18 19:46:17.000000000 +0000
-+++ Makefile
-@@ -15,6 +15,7 @@ LDFLAGS		+= -pthread -lm
- DESTDIR		?=
- PREFIX		?= /usr/local
- DATAROOTDIR ?= $(PREFIX)/share
-+MANROOTDIR ?= $(PREFIX)/man
- 
- HEADERS 	:= $(wildcard src/*.h src/*/*.h langs/*.h)
- SRC 		:= $(wildcard src/*.c src/ui/*.c src/av/*.c)
-@@ -32,7 +33,12 @@ UNX_OBJ		:= $(UNX_SRC:.c=.o)
- TRAY_OBJ	= icons/icon.o
- 
- 
--ifeq ($(UNAME_S), Linux)
-+ifeq ($(UNAME_O), Cygwin)
-+	SYS			= Cygwin
-+	OUT_FILE	=
-+	PKG_CONFIG	= x86_64-w64-mingw32-pkg-config
-+	CC			= x86_64-w64-mingw32-gcc
-+else
- 	SYS        	= Unix
- 	OUT_FILE 	= utox
- 	PKG_CONFIG 	= pkg-config
-@@ -68,7 +74,10 @@ ifeq ($(UNAME_S), Linux)
- 	endif
- 
- 	CFLAGS += $(shell $(PKG_CONFIG) --cflags $(DEPS))
--	LDFLAGS += -lresolv -ldl $(shell $(PKG_CONFIG) --libs $(DEPS))
-+	ifeq ($(UNAME_S), Linux)
-+		LDFLAGS += -ldl
-+	endif
-+	LDFLAGS += -lresolv $(shell $(PKG_CONFIG) --libs $(DEPS))
- 	TRAY_GEN = $(LD) -r -b binary icons/utox-128x128.png -o
- 
- 	ifeq ($(CC), x86_64-w64-mingw32-gcc)
-@@ -90,11 +99,6 @@ ifeq ($(UNAME_S), Linux)
- 		TRAY_GEN	= i686-w64-mingw32-windres icons/icon.rc -O coff -o
- 		CFLAGS		= $(WIN_CFLAGS)
- 	endif
--else ifeq ($(UNAME_O), Cygwin)
--	SYS			= Cygwin
--	OUT_FILE	=
--	PKG_CONFIG	= x86_64-w64-mingw32-pkg-config
--	CC			= x86_64-w64-mingw32-gcc
- endif
- 
- WIN_CFLAGS   = -Wall -Wshadow -static -Ofast -std=gnu99 -fgnu89-inline -fno-strict-aliasing -DAL_LIBTYPE_STATIC -DGIT_VERSION=\"$(GIT_V)\"
-@@ -190,8 +194,8 @@ install: utox
- 	install -m 644 src/utox.desktop $(DESTDIR)$(DATAROOTDIR)/applications/utox.desktop
- 	if [ "$(UNITY)" -eq "1" ]; then echo "X-MessagingMenu-UsesChatSection=true" >> $(DESTDIR)$(DATAROOTDIR)/applications/utox.desktop; fi
- 
--	mkdir -p $(DESTDIR)$(DATAROOTDIR)/man/man1
--	install -m 644 src/utox.1 $(DESTDIR)$(DATAROOTDIR)/man/man1/utox.1
-+	mkdir -p $(DESTDIR)$(MANROOTDIR)/man1
-+	install -m 644 src/utox.1 $(DESTDIR)$(MANROOTDIR)/man1/utox.1
- 
- $(OBJ): %.o: %.c $(HEADERS)
- 	@echo "      CC    $@"
diff --git a/uTox-git/patches/patch-src_xlib_CMakeLists.txt b/uTox-git/patches/patch-src_xlib_CMakeLists.txt
new file mode 100644
index 0000000..7cb45a1
--- /dev/null
+++ b/uTox-git/patches/patch-src_xlib_CMakeLists.txt
@@ -0,0 +1,17 @@
+$NetBSD$
+
+--- src/xlib/CMakeLists.txt.orig	2017-01-09 21:54:26.000000000 +0000
++++ src/xlib/CMakeLists.txt
+@@ -39,7 +39,11 @@ message("X library: ${X11_LIBRARIES}")
+ message("Xrender include: ${X11_Xrender_INCLUDE_PATH}")
+ message("Xrender library: ${X11_Xrender_LIB}")
+ 
+-target_link_libraries(utoxNATIVE icon v4lconvert ${X11_LIBRARIES} ${X11_Xrender_LIB} fontconfig ${FREETYPE_LIBRARIES} resolv dl )
++target_link_libraries(utoxNATIVE icon v4lconvert ${X11_LIBRARIES} ${X11_Xrender_LIB} fontconfig ${FREETYPE_LIBRARIES} resolv )
++
++if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
++  target_link_libraries(utoxNATIVE dl)
++endif()
+ 
+ install(FILES
+     ../utox.desktop
diff --git a/uTox-git/patches/patch-src_xlib_main.c b/uTox-git/patches/patch-src_xlib_main.c
index 7627a0f..11fdf56 100644
--- a/uTox-git/patches/patch-src_xlib_main.c
+++ b/uTox-git/patches/patch-src_xlib_main.c
@@ -2,32 +2,31 @@ $NetBSD$
 
 Avoid using Linux-specific headers when not compiling for Linux.
 
---- src/xlib/main.c.orig	2016-03-21 09:05:38.000000000 +0000
+--- src/xlib/main.c.orig	2017-01-09 21:54:26.000000000 +0000
 +++ src/xlib/main.c
-@@ -73,8 +73,9 @@ void postmessage(uint32_t msg, uint16_t 
+@@ -36,7 +36,9 @@ void postmessage_utox(UTOX_MSG msg, uint
      XFlush(display);
  }
  
--
 +#ifdef __LINUX__
  #include <linux/input.h>
 +#endif
- FILE *ptt_keyboard_handle;
+ FILE *   ptt_keyboard_handle;
  Display *ptt_display;
- void init_ptt(void){
-@@ -100,6 +101,7 @@ _Bool check_ptt_key(void){
+ void     init_ptt(void) {
+@@ -61,6 +63,7 @@ bool check_ptt_key(void) {
      int ptt_key;
  
      /* First, we try for direct access to the keyboard. */
 +#ifdef __LINUX__
-     ptt_key = KEY_LEFTCTRL;                                      // TODO allow user to change this...
+     ptt_key = KEY_LEFTCTRL; // TODO allow user to change this...
      if (ptt_keyboard_handle) {
          /* Nice! we have direct access to the keyboard! */
-@@ -117,6 +119,7 @@ _Bool check_ptt_key(void){
+@@ -79,6 +82,7 @@ bool check_ptt_key(void) {
              return 0;
          }
      }
 +#endif
      /* Okay nope, lets' fallback to xinput... *pouts*
       * Fall back to Querying the X for the current keymap. */
-     ptt_key = XKeysymToKeycode(display, XK_Control_L);
+     ptt_key       = XKeysymToKeycode(display, XK_Control_L);
diff --git a/uTox-git/patches/patch-src_xlib_video.c b/uTox-git/patches/patch-src_xlib_video.c
index 54e40cb..f1cd1a7 100644
--- a/uTox-git/patches/patch-src_xlib_video.c
+++ b/uTox-git/patches/patch-src_xlib_video.c
@@ -2,16 +2,16 @@ $NetBSD$
 
 The volatile macro is used in {amd64,i386,machine}/mcontext.h on NetBSD.
 
---- src/xlib/video.c.orig	2016-03-21 09:05:38.000000000 +0000
+--- src/xlib/video.c.orig	2017-01-09 21:54:26.000000000 +0000
 +++ src/xlib/video.c
-@@ -152,6 +152,10 @@ _Bool video_init(void *handle) {
-     if(isdesktop(handle)) {
+@@ -144,6 +144,10 @@ bool native_video_init(void *handle) {
+     if (isdesktop(handle)) {
          utox_v4l_fd = -1;
  
 +#ifndef volatile
 +#define volatile(x) (*((volatile typeof(x)*)&x))
 +#endif
 +
-         video_x = volatile(grabx);
-         video_y = volatile(graby);
-         video_width = volatile(grabpx);
+         video_x      = volatile(grabx);
+         video_y      = volatile(graby);
+         video_width  = volatile(grabpx);
Home | Main Index | Thread Index | Old Index