CVS commit: pkgsrc/devel

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Wed, 18 Mar 2020 01:23:01 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Mar 18 01:23:01 UTC 2020

Modified Files:
        pkgsrc/devel: Makefile
        pkgsrc/devel/allegro: DESCR Makefile
Added Files:
        pkgsrc/devel/allegro5: DESCR Makefile PLIST buildlink3.mk distinfo
            options.mk
        pkgsrc/devel/allegro5/patches: patch-src_unix_uxthread.c

Log Message:
devel: Import allegro5

Allegro is a cross-platform library mainly aimed at video game and multimedia
programming. It handles common, low-level tasks such as creating windows,
accepting user input, loading data, drawing images, playing sounds, etc.
and generally abstracting away the underlying platform.


To generate a diff of this commit:
cvs rdiff -u -r1.3060 -r1.3061 pkgsrc/devel/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/allegro/DESCR
cvs rdiff -u -r1.42 -r1.43 pkgsrc/devel/allegro/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/allegro5/DESCR \
    pkgsrc/devel/allegro5/Makefile pkgsrc/devel/allegro5/PLIST \
    pkgsrc/devel/allegro5/buildlink3.mk pkgsrc/devel/allegro5/distinfo \
    pkgsrc/devel/allegro5/options.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/allegro5/patches/patch-src_unix_uxthread.c

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

Modified files:

Index: pkgsrc/devel/Makefile
diff -u pkgsrc/devel/Makefile:1.3060 pkgsrc/devel/Makefile:1.3061
--- pkgsrc/devel/Makefile:1.3060        Mon Mar 16 14:28:11 2020
+++ pkgsrc/devel/Makefile       Wed Mar 18 01:23:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3060 2020/03/16 14:28:11 wiz Exp $
+# $NetBSD: Makefile,v 1.3061 2020/03/18 01:23:00 nia Exp $
 #
 
 COMMENT=       Development utilities
@@ -96,6 +96,7 @@ SUBDIR+=      afl
 SUBDIR+=       ald
 SUBDIR+=       alex
 SUBDIR+=       allegro
+SUBDIR+=       allegro5
 SUBDIR+=       amtk
 SUBDIR+=       anjuta
 SUBDIR+=       ant-contrib

Index: pkgsrc/devel/allegro/DESCR
diff -u pkgsrc/devel/allegro/DESCR:1.2 pkgsrc/devel/allegro/DESCR:1.3
--- pkgsrc/devel/allegro/DESCR:1.2      Mon May 23 08:26:05 2005
+++ pkgsrc/devel/allegro/DESCR  Wed Mar 18 01:23:00 2020
@@ -6,11 +6,4 @@ According to the Oxford Companion to Mus
 "quick, lively, bright". It is also a recursive acronym which stands for
 "Allegro Low LEvel Game ROutines".
 
-Cross-platform support
-
-    o Dos (DJGPP, Watcom)
-    o Unix (Linux, *BSD, Irix, Solaris, Darwin)
-    o Windows (MSVC, MinGW, Cygwin, Borland)
-    o BeOS
-    o QNX
-    o MacOS X
+This is the legacy 4.x branch, for the current version see devel/allegro5.

Index: pkgsrc/devel/allegro/Makefile
diff -u pkgsrc/devel/allegro/Makefile:1.42 pkgsrc/devel/allegro/Makefile:1.43
--- pkgsrc/devel/allegro/Makefile:1.42  Mon Jan 20 21:32:59 2020
+++ pkgsrc/devel/allegro/Makefile       Wed Mar 18 01:23:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2020/01/20 21:32:59 nia Exp $
+# $NetBSD: Makefile,v 1.43 2020/03/18 01:23:00 nia Exp $
 
 DISTNAME=      allegro-4.4.3.1
 PKGREVISION=   1
@@ -9,7 +9,7 @@ GITHUB_RELEASE= ${PKGVERSION_NOREV}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://liballeg.org/
-COMMENT=       Allegro game programming library
+COMMENT=       Cross-platform library aimed at video game programming (4.x branch)
 #LICENSE=      # TODO: (see mk/license.mk)
 
 USE_CMAKE=     yes

Added files:

Index: pkgsrc/devel/allegro5/DESCR
diff -u /dev/null pkgsrc/devel/allegro5/DESCR:1.1
--- /dev/null   Wed Mar 18 01:23:01 2020
+++ pkgsrc/devel/allegro5/DESCR Wed Mar 18 01:23:01 2020
@@ -0,0 +1,4 @@
+Allegro is a cross-platform library mainly aimed at video game and multimedia
+programming. It handles common, low-level tasks such as creating windows,
+accepting user input, loading data, drawing images, playing sounds, etc.
+and generally abstracting away the underlying platform.
Index: pkgsrc/devel/allegro5/Makefile
diff -u /dev/null pkgsrc/devel/allegro5/Makefile:1.1
--- /dev/null   Wed Mar 18 01:23:01 2020
+++ pkgsrc/devel/allegro5/Makefile      Wed Mar 18 01:23:01 2020
@@ -0,0 +1,61 @@
+# $NetBSD: Makefile,v 1.1 2020/03/18 01:23:01 nia Exp $
+
+DISTNAME=      allegro-5.2.6.0
+PKGNAME=       ${DISTNAME:S/allegro-/allegro5-/1}
+CATEGORIES=    devel
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=liballeg/}
+GITHUB_PROJECT=        allegro5
+GITHUB_RELEASE=        ${PKGVERSION_NOREV}
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      https://liballeg.org/
+COMMENT=       Cross-platform library aimed at video game programming
+LICENSE=       zlib
+
+USE_CMAKE=     yes
+USE_TOOLS+=    pkg-config
+USE_LANGUAGES= c c++
+
+CMAKE_ARGS+=   -Wno-dev
+CMAKE_ARGS+=   -DWANT_IMAGE_FREEIMAGE=OFF
+
+.include "../../mk/oss.buildlink3.mk"
+.if ${OSS_TYPE} != "none"
+LDFLAGS+=      ${LIBOSSAUDIO}
+.else
+CMAKE_ARGS+=   -DWANT_OSS=OFF
+.endif
+
+PKGCONFIG_OVERRIDE+=   misc/allegro.pc.in
+PKGCONFIG_OVERRIDE+=   misc/allegro_acodec.pc.in
+PKGCONFIG_OVERRIDE+=   misc/allegro_audio.pc.in
+PKGCONFIG_OVERRIDE+=   misc/allegro_color.pc.in
+PKGCONFIG_OVERRIDE+=   misc/allegro_dialog.pc.in
+PKGCONFIG_OVERRIDE+=   misc/allegro_font.pc.in
+PKGCONFIG_OVERRIDE+=   misc/allegro_image.pc.in
+PKGCONFIG_OVERRIDE+=   misc/allegro_main.pc.in
+PKGCONFIG_OVERRIDE+=   misc/allegro_memfile.pc.in
+PKGCONFIG_OVERRIDE+=   misc/allegro_monolith.pc.in
+PKGCONFIG_OVERRIDE+=   misc/allegro_physfs.pc.in
+PKGCONFIG_OVERRIDE+=   misc/allegro_primitives.pc.in
+PKGCONFIG_OVERRIDE+=   misc/allegro_ttf.pc.in
+PKGCONFIG_OVERRIDE+=   misc/allegro_video.pc.in
+
+.include "options.mk"
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} != "Darwin"
+.  include "../../graphics/MesaLib/buildlink3.mk"
+.  include "../../graphics/glu/buildlink3.mk"
+.  include "../../graphics/png/buildlink3.mk"
+.  include "../../mk/jpeg.buildlink3.mk"
+.endif
+.include "../../audio/dumb/buildlink3.mk"
+.include "../../audio/flac/buildlink3.mk"
+.include "../../audio/libvorbis/buildlink3.mk"
+.include "../../audio/opusfile/buildlink3.mk"
+.include "../../devel/physfs/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/libwebp/buildlink3.mk"
+.include "../../multimedia/libtheora/buildlink3.mk"
+.include "../../net/enet/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/allegro5/PLIST
diff -u /dev/null pkgsrc/devel/allegro5/PLIST:1.1
--- /dev/null   Wed Mar 18 01:23:01 2020
+++ pkgsrc/devel/allegro5/PLIST Wed Mar 18 01:23:01 2020
@@ -0,0 +1,143 @@
+@comment $NetBSD: PLIST,v 1.1 2020/03/18 01:23:01 nia Exp $
+include/allegro5/alcompat.h
+include/allegro5/allegro.h
+include/allegro5/allegro5.h
+include/allegro5/allegro_acodec.h
+include/allegro5/allegro_audio.h
+include/allegro5/allegro_color.h
+include/allegro5/allegro_direct3d.h
+include/allegro5/allegro_font.h
+include/allegro5/allegro_image.h
+include/allegro5/allegro_memfile.h
+include/allegro5/allegro_native_dialog.h
+include/allegro5/allegro_opengl.h
+include/allegro5/allegro_physfs.h
+include/allegro5/allegro_primitives.h
+include/allegro5/allegro_ttf.h
+include/allegro5/allegro_video.h
+include/allegro5/allegro_x.h
+include/allegro5/altime.h
+include/allegro5/base.h
+include/allegro5/bitmap.h
+include/allegro5/bitmap_draw.h
+include/allegro5/bitmap_io.h
+include/allegro5/bitmap_lock.h
+include/allegro5/blender.h
+include/allegro5/clipboard.h
+include/allegro5/color.h
+include/allegro5/config.h
+include/allegro5/cpu.h
+include/allegro5/debug.h
+include/allegro5/display.h
+include/allegro5/drawing.h
+include/allegro5/error.h
+include/allegro5/events.h
+include/allegro5/file.h
+include/allegro5/fixed.h
+include/allegro5/fmaths.h
+include/allegro5/fshook.h
+include/allegro5/fullscreen_mode.h
+include/allegro5/haptic.h
+include/allegro5/inline/fmaths.inl
+include/allegro5/internal/alconfig.h
+include/allegro5/joystick.h
+include/allegro5/keyboard.h
+include/allegro5/keycodes.h
+include/allegro5/memory.h
+include/allegro5/monitor.h
+include/allegro5/mouse.h
+include/allegro5/mouse_cursor.h
+include/allegro5/opengl/GLext/gl_ext_alias.h
+include/allegro5/opengl/GLext/gl_ext_api.h
+include/allegro5/opengl/GLext/gl_ext_defs.h
+include/allegro5/opengl/GLext/gl_ext_list.h
+include/allegro5/opengl/GLext/glx_ext_alias.h
+include/allegro5/opengl/GLext/glx_ext_api.h
+include/allegro5/opengl/GLext/glx_ext_defs.h
+include/allegro5/opengl/GLext/glx_ext_list.h
+include/allegro5/opengl/GLext/wgl_ext_alias.h
+include/allegro5/opengl/GLext/wgl_ext_api.h
+include/allegro5/opengl/GLext/wgl_ext_defs.h
+include/allegro5/opengl/GLext/wgl_ext_list.h
+include/allegro5/opengl/gl_ext.h
+include/allegro5/path.h
+include/allegro5/platform/alandroid.h
+include/allegro5/platform/alandroidcfg.h
+include/allegro5/platform/albcc32.h
+include/allegro5/platform/aliphone.h
+include/allegro5/platform/aliphonecfg.h
+include/allegro5/platform/allegro_sdl_config.h
+include/allegro5/platform/almngw32.h
+include/allegro5/platform/almsvc.h
+include/allegro5/platform/alosx.h
+include/allegro5/platform/alosxcfg.h
+include/allegro5/platform/alplatf.h
+include/allegro5/platform/alraspberrypi.h
+include/allegro5/platform/alraspberrypicfg.h
+include/allegro5/platform/alucfg.h
+include/allegro5/platform/alunix.h
+include/allegro5/platform/alwatcom.h
+include/allegro5/platform/alwin.h
+include/allegro5/platform/astdbool.h
+include/allegro5/platform/astdint.h
+include/allegro5/render_state.h
+include/allegro5/shader.h
+include/allegro5/system.h
+include/allegro5/threads.h
+include/allegro5/timer.h
+include/allegro5/tls.h
+include/allegro5/touch_input.h
+include/allegro5/transformations.h
+include/allegro5/utf8.h
+lib/liballegro.so
+lib/liballegro.so.5.2
+lib/liballegro.so.5.2.6
+lib/liballegro_acodec.so
+lib/liballegro_acodec.so.5.2
+lib/liballegro_acodec.so.5.2.6
+lib/liballegro_audio.so
+lib/liballegro_audio.so.5.2
+lib/liballegro_audio.so.5.2.6
+lib/liballegro_color.so
+lib/liballegro_color.so.5.2
+lib/liballegro_color.so.5.2.6
+lib/liballegro_dialog.so
+lib/liballegro_dialog.so.5.2
+lib/liballegro_dialog.so.5.2.6
+lib/liballegro_font.so
+lib/liballegro_font.so.5.2
+lib/liballegro_font.so.5.2.6
+lib/liballegro_image.so
+lib/liballegro_image.so.5.2
+lib/liballegro_image.so.5.2.6
+lib/liballegro_main.so
+lib/liballegro_main.so.5.2
+lib/liballegro_main.so.5.2.6
+lib/liballegro_memfile.so
+lib/liballegro_memfile.so.5.2
+lib/liballegro_memfile.so.5.2.6
+lib/liballegro_physfs.so
+lib/liballegro_physfs.so.5.2
+lib/liballegro_physfs.so.5.2.6
+lib/liballegro_primitives.so
+lib/liballegro_primitives.so.5.2
+lib/liballegro_primitives.so.5.2.6
+lib/liballegro_ttf.so
+lib/liballegro_ttf.so.5.2
+lib/liballegro_ttf.so.5.2.6
+lib/liballegro_video.so
+lib/liballegro_video.so.5.2
+lib/liballegro_video.so.5.2.6
+lib/pkgconfig/allegro-5.pc
+lib/pkgconfig/allegro_acodec-5.pc
+lib/pkgconfig/allegro_audio-5.pc
+lib/pkgconfig/allegro_color-5.pc
+lib/pkgconfig/allegro_dialog-5.pc
+lib/pkgconfig/allegro_font-5.pc
+lib/pkgconfig/allegro_image-5.pc
+lib/pkgconfig/allegro_main-5.pc
+lib/pkgconfig/allegro_memfile-5.pc
+lib/pkgconfig/allegro_physfs-5.pc
+lib/pkgconfig/allegro_primitives-5.pc
+lib/pkgconfig/allegro_ttf-5.pc
+lib/pkgconfig/allegro_video-5.pc
Index: pkgsrc/devel/allegro5/buildlink3.mk
diff -u /dev/null pkgsrc/devel/allegro5/buildlink3.mk:1.1
--- /dev/null   Wed Mar 18 01:23:01 2020
+++ pkgsrc/devel/allegro5/buildlink3.mk Wed Mar 18 01:23:01 2020
@@ -0,0 +1,24 @@
+# $NetBSD: buildlink3.mk,v 1.1 2020/03/18 01:23:01 nia Exp $
+
+BUILDLINK_TREE+=       allegro5
+
+.if !defined(ALLEGRO5_BUILDLINK3_MK)
+ALLEGRO5_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.allegro5+=       allegro5>=5.2.6.0
+BUILDLINK_PKGSRCDIR.allegro5?=         ../../devel/allegro5
+
+pkgbase:= allegro5
+
+.include "../../mk/pkg-build-options.mk"
+
+.if !empty(PKG_BUILD_OPTIONS.MesaLib:Mx11)
+.  include "../../x11/libX11/buildlink3.mk"
+.endif
+
+.if ${OPSYS} != "Darwin"
+.  include "../../graphics/MesaLib/buildlink3.mk"
+.endif
+.endif # ALLEGRO5_BUILDLINK3_MK
+
+BUILDLINK_TREE+=       -allegro5
Index: pkgsrc/devel/allegro5/distinfo
diff -u /dev/null pkgsrc/devel/allegro5/distinfo:1.1
--- /dev/null   Wed Mar 18 01:23:01 2020
+++ pkgsrc/devel/allegro5/distinfo      Wed Mar 18 01:23:01 2020
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1 2020/03/18 01:23:01 nia Exp $
+
+SHA1 (allegro-5.2.6.0.tar.gz) = 4d576cae5a490e8084b9b79c432edf115dc318cd
+RMD160 (allegro-5.2.6.0.tar.gz) = 9a00d87207e36b0b97603cb12c8d22866e15ea88
+SHA512 (allegro-5.2.6.0.tar.gz) = a475de67b0e6c727295cc51e113859eb0c57825a240e70bc45cd3b000c40518932b89cecdd13ba957416136db4ee9a9363adb5d3bfa7c8acda04ee95de6ba721
+Size (allegro-5.2.6.0.tar.gz) = 7867726 bytes
+SHA1 (patch-src_unix_uxthread.c) = 70fb118d3441b72e38b90353644a2a1bf567c5b6
Index: pkgsrc/devel/allegro5/options.mk
diff -u /dev/null pkgsrc/devel/allegro5/options.mk:1.1
--- /dev/null   Wed Mar 18 01:23:01 2020
+++ pkgsrc/devel/allegro5/options.mk    Wed Mar 18 01:23:01 2020
@@ -0,0 +1,52 @@
+# $NetBSD: options.mk,v 1.1 2020/03/18 01:23:01 nia Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.allegro5
+PKG_SUPPORTED_OPTIONS=         alsa openal pulseaudio x11
+PKG_SUGGESTED_OPTIONS.Linux=   alsa
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${OPSYS} != "Darwin"
+PKG_SUGGESTED_OPTIONS=         x11
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Malsa)
+CMAKE_ARGS+=   -DWANT_ALSA=ON
+.  include "../../audio/alsa-lib/buildlink3.mk"
+.else
+CMAKE_ARGS+=   -DWANT_ALSA=OFF
+.endif
+
+.if !empty(PKG_OPTIONS:Mopenal)
+CMAKE_ARGS+=   -DWANT_OPENAL=ON
+.  include "../../audio/openal-soft/buildlink3.mk"
+.else
+CMAKE_ARGS+=   -DWANT_OPENAL=OFF
+.endif
+
+.if !empty(PKG_OPTIONS:Mpulseaudio)
+CMAKE_ARGS+=   -DWANT_PULSEAUDIO=ON
+.  include "../../audio/pulseaudio/buildlink3.mk"
+.else
+CMAKE_ARGS+=   -DWANT_PULSEAUDIO=OFF
+.endif
+
+.if !empty(PKG_OPTIONS:Mx11)
+CMAKE_ARGS+=   -DWANT_X11=ON
+.  include "../../x11/libICE/buildlink3.mk"
+.  include "../../x11/libXScrnSaver/buildlink3.mk"
+.  include "../../x11/libX11/buildlink3.mk"
+.  include "../../x11/libXcursor/buildlink3.mk"
+.  include "../../x11/libXext/buildlink3.mk"
+.  include "../../x11/libXinerama/buildlink3.mk"
+.  include "../../x11/libXpm/buildlink3.mk"
+.  include "../../x11/libXrandr/buildlink3.mk"
+.  include "../../x11/libXxf86vm/buildlink3.mk"
+.  if ${OPSYS} != "Darwin"
+.    include "../../x11/gtk2/buildlink3.mk" # native_dialog
+.  endif
+.else
+CMAKE_ARGS+=   -DWANT_X11=OFF
+.endif

Index: pkgsrc/devel/allegro5/patches/patch-src_unix_uxthread.c
diff -u /dev/null pkgsrc/devel/allegro5/patches/patch-src_unix_uxthread.c:1.1
--- /dev/null   Wed Mar 18 01:23:01 2020
+++ pkgsrc/devel/allegro5/patches/patch-src_unix_uxthread.c     Wed Mar 18 01:23:01 2020
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_unix_uxthread.c,v 1.1 2020/03/18 01:23:01 nia Exp $
+
+Not just absent in GNU (NetBSD, too...)
+
+--- src/unix/uxthread.c.orig   2019-08-26 12:52:05.000000000 +0000
++++ src/unix/uxthread.c
+@@ -72,9 +72,6 @@ void _al_thread_create(_AL_THREAD *threa
+ 
+ void _al_thread_create_with_stacksize(_AL_THREAD* thread, void (*proc)(_AL_THREAD*, void*), void *arg, size_t stacksize) 
+ {
+-#ifndef __GNU__
+-   ASSERT(stacksize >= PTHREAD_STACK_MIN);
+-#endif
+    ASSERT(thread);
+    ASSERT(proc);
+    {

Prev by Date: CVS commit: pkgsrc/lang/ruby24-base
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/lang/ruby24-base
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index