From owner-svn-ports-all@freebsd.org Mon Aug 24 20:21:09 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 87CCD3CC169; Mon, 24 Aug 2020 20:21:09 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bb3RT37Ghz4DVC; Mon, 24 Aug 2020 20:21:09 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4FFCB1E44A; Mon, 24 Aug 2020 20:21:09 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07OKL91V018961; Mon, 24 Aug 2020 20:21:09 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07OKL84e018955; Mon, 24 Aug 2020 20:21:08 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <202008242021.07OKL84e018955@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Mon, 24 Aug 2020 20:21:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r546109 - in head/x11-drivers/xf86-video-geode: . files X-SVN-Group: ports-head X-SVN-Commit-Author: zeising X-SVN-Commit-Paths: in head/x11-drivers/xf86-video-geode: . files X-SVN-Commit-Revision: 546109 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Aug 2020 20:21:09 -0000 Author: zeising Date: Mon Aug 24 20:21:07 2020 New Revision: 546109 URL: https://svnweb.freebsd.org/changeset/ports/546109 Log: x11-drivers/xf86-video-geode: Fix -fno-common Fix the build of x11-drivers/xf86-video-geode when compiled with -fno-common, which is the default with llvm 11. While here, add license. MFH: 2020Q3 (implicit, -fno-common fixes, ok by joenum) Added: head/x11-drivers/xf86-video-geode/files/ head/x11-drivers/xf86-video-geode/files/patch-src_geode.h (contents, props changed) head/x11-drivers/xf86-video-geode/files/patch-src_gx__video.c (contents, props changed) head/x11-drivers/xf86-video-geode/files/patch-src_lx__driver.c (contents, props changed) head/x11-drivers/xf86-video-geode/files/patch-src_panel.c (contents, props changed) head/x11-drivers/xf86-video-geode/files/patch-src_panel_panel.c (contents, props changed) Modified: head/x11-drivers/xf86-video-geode/Makefile Modified: head/x11-drivers/xf86-video-geode/Makefile ============================================================================== --- head/x11-drivers/xf86-video-geode/Makefile Mon Aug 24 19:47:25 2020 (r546108) +++ head/x11-drivers/xf86-video-geode/Makefile Mon Aug 24 20:21:07 2020 (r546109) @@ -8,6 +8,9 @@ CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org geode display driver +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/COPYING + USES= xorg-cat:driver ONLY_FOR_ARCHS= i386 Added: head/x11-drivers/xf86-video-geode/files/patch-src_geode.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-drivers/xf86-video-geode/files/patch-src_geode.h Mon Aug 24 20:21:07 2020 (r546109) @@ -0,0 +1,34 @@ +--- src/geode.h.orig 2020-08-24 18:11:55 UTC ++++ src/geode.h +@@ -343,7 +343,7 @@ typedef struct _geodeRec { + + /* option flags are self-explanatory */ + #ifdef HAVE_LX +-enum { ++enum LX_GeodeOpts { + LX_OPTION_SW_CURSOR, + LX_OPTION_HW_CURSOR, + LX_OPTION_NOCOMPRESSION, +@@ -357,11 +357,11 @@ enum { + LX_OPTION_FBSIZE, + LX_OPTION_PANEL_MODE, + LX_OPTION_DONT_PROGRAM +-} LX_GeodeOpts; ++}; + #endif + + #ifdef HAVE_GX +-enum { ++enum GX_GeodeOpts { + GX_OPTION_SW_CURSOR, + GX_OPTION_HW_CURSOR, + GX_OPTION_NOCOMPRESSION, +@@ -378,7 +378,7 @@ enum { + GX_OPTION_FBSIZE, + GX_OPTION_PANEL_GEOMETRY, + GX_OPTION_DONT_PROGRAM +-} GX_GeodeOpts; ++}; + #endif + + /* geode_dcon.c */ Added: head/x11-drivers/xf86-video-geode/files/patch-src_gx__video.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-drivers/xf86-video-geode/files/patch-src_gx__video.c Mon Aug 24 20:21:07 2020 (r546109) @@ -0,0 +1,11 @@ +--- src/gx_video.c.orig 2020-08-24 18:14:49 UTC ++++ src/gx_video.c +@@ -112,7 +112,7 @@ void GXSetVideoPosition(int x, int y, int width, int h + + extern void GXAccelSync(ScrnInfoPtr pScrni); + +-int DeltaX, DeltaY; ++extern int DeltaX, DeltaY; + + unsigned long graphics_lut[256]; + static int lutflag = 0; Added: head/x11-drivers/xf86-video-geode/files/patch-src_lx__driver.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-drivers/xf86-video-geode/files/patch-src_lx__driver.c Mon Aug 24 20:21:07 2020 (r546109) @@ -0,0 +1,11 @@ +--- src/lx_driver.c.orig 2020-08-24 20:15:55 UTC ++++ src/lx_driver.c +@@ -74,7 +74,7 @@ + + extern OptionInfoRec LX_GeodeOptions[]; + +-unsigned char *XpressROMPtr; ++extern unsigned char *XpressROMPtr; + + static Bool + LXSaveScreen(ScreenPtr pScrn, int mode) Added: head/x11-drivers/xf86-video-geode/files/patch-src_panel.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-drivers/xf86-video-geode/files/patch-src_panel.c Mon Aug 24 20:21:07 2020 (r546109) @@ -0,0 +1,11 @@ +--- src/panel.c.orig 2019-09-20 16:17:28 UTC ++++ src/panel.c +@@ -51,7 +51,7 @@ + #define PLATFORM_DORADO 1 /* Dorado + 9211 RevC */ + #define PLATFORM_GX2BASED 1 /* Redcloud */ + +-unsigned char *XpressROMPtr; ++extern unsigned char *XpressROMPtr; + + #include "pnl_init.c" + #include "pnl_bios.c" Added: head/x11-drivers/xf86-video-geode/files/patch-src_panel_panel.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-drivers/xf86-video-geode/files/patch-src_panel_panel.c Mon Aug 24 20:21:07 2020 (r546109) @@ -0,0 +1,11 @@ +--- src/panel/panel.c.orig 2019-09-20 16:17:28 UTC ++++ src/panel/panel.c +@@ -65,7 +65,7 @@ extern unsigned long gfx_detect_video(void); + #define PLATFORM_DORADO 1 /* Dorado + 9211 RevC */ + #define PLATFORM_REDCLOUD 1 /* GX2 */ + +-unsigned char *XpressROMPtr; ++extern unsigned char *XpressROMPtr; + + #include "pnl_init.c" + #include "pnl_bios.c"