[openchrome-devel] xf86-video-openchrome: Branch 'main' - 3 commits - configure.ac src/Makefile.am

2020-09-02 Thread Kevin Brace 
 configure.ac|   90 +++-
 src/Makefile.am |  126 ++--
 2 files changed, 111 insertions(+), 105 deletions(-)

New commits:
commit 476bdc466e0964effb4931f0f9dd0e335636e639
Author: Kevin Brace 
Date:   Wed Sep 2 13:08:20 2020 -0700

Version bumped to 0.6.310

This version significantly improves the build script for KMS support.

Signed-off-by: Kevin Brace 

diff --git a/configure.ac b/configure.ac
index fdf9cf9..b64db0b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-openchrome],
-[0.6.309],
+[0.6.310],
 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg=Driver/openchrome],
 [xf86-video-openchrome])
 
commit 0dae4fff61fc1257709a4417aa263265eb3ea5a7
Author: Kevin Brace 
Date:   Wed Sep 2 13:07:11 2020 -0700

Add the ability to disable KMS support

This commit also fixes a build issue when DRI is disabled.

Signed-off-by: Kevin Brace 

diff --git a/configure.ac b/configure.ac
index e6d33b7..fdf9cf9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,6 +58,11 @@ AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri],
   [DRI="$enableval"],
   [DRI=auto])
 
+AC_ARG_ENABLE(kms, AS_HELP_STRING([--disable-kms],
+  [Disable KMS support [[default=enabled]]]),
+  [DRM_MODE="$enableval"],
+  [DRM_MODE=yes])
+
 AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug],
 [Enable debugging support [[default=no]]]),
   [DEBUG="$enableval"],
@@ -143,16 +148,20 @@ if test "$DRI" = yes; then
 AC_DEFINE(OPENCHROMEDRI_DEVEL, 1, [Enable developmental DRI driver 
support])
 save_CFLAGS="$CFLAGS"
 CFLAGS="$XORG_CFLAGS $DRI_CFLAGS $CFLAGS"
-AC_CHECK_HEADER(xf86drmMode.h,
-[DRM_MODE=yes], [DRM_MODE=no],
-[#include 
- #include ])
 if test "x$DRM_MODE" = xyes; then
-PKG_CHECK_MODULES(LIBUDEV, [libudev],
-  [LIBUDEV=yes], [LIBUDEV=no])
-if test "x$LIBUDEV" = xyes; then
-AC_DEFINE(HAVE_LIBUDEV, 1, [libudev support])
+AC_CHECK_HEADER(xf86drmMode.h,
+[DRM_KMS=yes], [DRM_KMS=no],
+[#include 
+ #include ])
+if test "x$DRM_KMS" = xyes; then
+PKG_CHECK_MODULES(LIBUDEV, [libudev],
+  [LIBUDEV=yes], [LIBUDEV=no])
+if test "x$LIBUDEV" = xyes; then
+AC_DEFINE(HAVE_LIBUDEV, 1, [libudev support])
+fi
 fi
+else
+DRM_KMS=no
 fi
 CFLAGS="$save_CFLAGS"
 
@@ -165,9 +174,13 @@ if test "$DRI" = yes; then
 XVMC=no ;;
 esac
 else
+DRM_KMS=no
 XVMC="no"
 fi
 
+AC_MSG_CHECKING([whether to include KMS support])
+AC_MSG_RESULT([$DRM_KMS])
+
 if test "x$XVMC" = xyes; then
 AC_CHECK_HEADERS(pthread.h sys/ioctl.h sys/time.h time.h,,[XVMC="no"; 
break],)
 PKG_CHECK_MODULES(XVMC, [x11 xext xvmc])
@@ -176,6 +189,8 @@ fi
 AC_MSG_CHECKING([whether to build XvMC driver support])
 AC_MSG_RESULT([$XVMC])
 
+AM_CONDITIONAL(XF86DRM_MODE, test "x$DRM_KMS" = xyes)
+
 AM_CONDITIONAL(XVMC, test x$XVMC = xyes)
 
 AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test x$XSERVER_LIBPCIACCESS = xyes)
diff --git a/src/Makefile.am b/src/Makefile.am
index 9d47ada..8e8df29 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,78 +26,70 @@
 
 SUBDIRS = xvmc
 
+if DRI
+OPENCHROME_DRI_SRCS = \
+via_dri.c \
+via_xvmc.c
+endif
+
+if XF86DRM_MODE
+OPENCHROME_KMS_SRCS = \
+drmmode_display.c
+endif
+
 AM_CFLAGS = @XORG_CFLAGS@ $(CWARNFLAGS) @DRI_CFLAGS@ @LIBUDEV_CFLAGS@
+
 openchrome_drv_la_LTLIBRARIES = openchrome_drv.la
 openchrome_drv_la_LDFLAGS = -module -avoid-version
 openchrome_drv_ladir = @moduledir@/drivers
 
 openchrome_drv_la_SOURCES = \
- compat-api.h \
- via_eng_regs.h \
- via_3d.c \
- via_3d.h \
- via_3d_reg.h \
- via_analog.c \
- via_rop.h \
- via_exa.c \
- via_exa_h2.c \
- via_exa_h6.c \
- via_ums.h \
- via_ch7xxx.c \
- via_ch7xxx.h \
- via_display.c \
- via_dmabuffer.h \
- via_driver.c \
- via_driver.h \
- via_i2c.c \
- via_fp.c \
- via_fp.h \
- via_memcpy.c \
- via_memmgr.h \
- via_memmgr.c \
- via_options.c \
- via_outputs.c \
- via_priv.h \
- via_regs.h \
- via_sii164.c \
- via_sii164.h \
- via_tmds.c \
- via_tv.c \
- via_xv_overlay.c \
- via_xv_overlay.h \
- via_ums.c \
- via_vgahw.c \
- via_vgahw.h \
- via_xv.c \
- via_xv.h \
- via_vt162x.c \
-

[openchrome-devel] xf86-video-openchrome: Branch 'main' - 3 commits - configure.ac src/Makefile.am src/via_driver.c

2020-09-01 Thread Kevin Brace 
 configure.ac |2 +-
 src/Makefile.am  |   36 +---
 src/via_driver.c |8 
 3 files changed, 2 insertions(+), 44 deletions(-)

New commits:
commit 31419879d96689bf9f89c14170ad7940647021b0
Author: Kevin Brace 
Date:   Tue Sep 1 16:32:28 2020 -0700

Version bumped to 0.6.309

Signed-off-by: Kevin Brace 

diff --git a/configure.ac b/configure.ac
index ad1ba88..238d628 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-openchrome],
-[0.6.308],
+[0.6.309],
 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg=Driver/openchrome],
 [xf86-video-openchrome])
 
commit d80da6bbe39512183dcee990e771c1857b0fb9f6
Author: Kevin Brace 
Date:   Tue Sep 1 16:28:30 2020 -0700

Stop automatic generation of src/version.h

It has outlived its usefulness.  Time to retire it.

Signed-off-by: Kevin Brace 

diff --git a/src/Makefile.am b/src/Makefile.am
index 2be45e6..9d47ada 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,9 +26,6 @@
 
 SUBDIRS = xvmc
 
-BUILT_SOURCES = version.h
-EXTRA_DIST = version.h
-CONFIG_CLEAN_FILES= version.h
 AM_CFLAGS = @XORG_CFLAGS@ $(CWARNFLAGS) @DRI_CFLAGS@ @LIBUDEV_CFLAGS@
 openchrome_drv_la_LTLIBRARIES = openchrome_drv.la
 openchrome_drv_la_LDFLAGS = -module -avoid-version
@@ -92,7 +89,7 @@ openchrome_drv_la_SOURCES += \
  drm_fourcc.h \
  openchrome_drm.h
 else
-EXTRA_DIST += \
+EXTRA_DIST = \
  drmmode_display.c \
  drmmode_display.h \
  via_dri.c \
@@ -104,23 +101,3 @@ EXTRA_DIST += \
  drm_fourcc.h \
  openchrome_drm.h
 endif
-
-via_driver.lo: version.h
-version.h: $(openchrome_drv_la_SOURCES)
-   @if [ -d ../.git ]; then \
-echo '#define BUILDCOMMENT "(development build, branch' \
- "`git branch -v | sed 's/no branch/no_branch/' | \
-  awk '/^\*/ { print $$2 }'`" \
- 'at revision' \
- "`git log -1 --pretty=format:%h | head -1`"')"' \
-> $@.tmp; \
-fi
-
-   @chmod 666 $@.tmp
-   @mv $@.tmp $@
-   @echo "created $@"
-
-dist-hook:
-   @[ -e version.h ] && rm version.h; \
-   echo '#define BUILDCOMMENT "(openchrome '$(VERSION)' release)"' \
-   > version.h
diff --git a/src/via_driver.c b/src/via_driver.c
index acc5964..03e5942 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -40,7 +40,6 @@
 #include 
 #endif
 
-#include "version.h"
 #include "via_driver.h"
 #include "drm_fourcc.h"
 
@@ -449,9 +448,6 @@ via_pci_probe(DriverPtr driver, int entity_num,
 xf86Msg(X_NOTICE,
 "For support, please refer to"
 " https://www.freedesktop.org/wiki/Openchrome/.\n;);
-#ifdef BUILDCOMMENT
-xf86Msg(X_NOTICE, BUILDCOMMENT"\n");
-#endif
 }
 return scrn != NULL;
 }
@@ -491,10 +487,6 @@ VIAProbe(DriverPtr drv, int flags)
 xf86Msg(X_NOTICE, "For support, please refer to"
   " https://www.freedesktop.org/wiki/Openchrome/.\n;);
 
-#ifdef BUILDCOMMENT
-xf86Msg(X_NOTICE, BUILDCOMMENT"\n");
-#endif
-
 if (flags & PROBE_DETECT) {
 foundScreen = TRUE;
 } else {
commit 26f57224ee3d68fd53da2217dd021fb6e678b035
Author: Kevin Brace 
Date:   Tue Sep 1 16:07:31 2020 -0700

Remove last vestiges of svn from the build script

Signed-off-by: Kevin Brace 

diff --git a/src/Makefile.am b/src/Makefile.am
index a4d3e2b..2be45e6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -114,17 +114,6 @@ version.h: $(openchrome_drv_la_SOURCES)
  'at revision' \
  "`git log -1 --pretty=format:%h | head -1`"')"' \
 > $@.tmp; \
-else \
-if [ -d .svn ]; then \
-   echo '#define BUILDCOMMENT "(development build, at revision '\
-   "`svnversion -nc .. | sed -e s/^[^:]*://`"')"' > 
$@.tmp; \
-elif [ "$$SOURCE_DATE_EPOCH" ]; then \
-   printf '#define BUILDCOMMENT "(compiled with SOURCE_DATE_EPOCH: 
%s)"' $$SOURCE_DATE_EPOCH \
-   > $@.tmp; \
-else \
-   date +'#define BUILDCOMMENT "(development build, compiled on 
%c)"' \
-   > $@.tmp; \
-   fi; \
 fi
 
@chmod 666 $@.tmp
___
openchrome-devel mailing list
openchrome-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/openchrome-devel

[openchrome-devel] xf86-video-openchrome: Branch 'main' - 3 commits - configure.ac src/Makefile.am src/via_memmgr.c src/via_memmgr.h

2020-08-11 Thread Kevin Brace 
 configure.ac |2 +-
 src/Makefile.am  |6 --
 src/via_memmgr.c |1 +
 src/via_memmgr.h |1 +
 4 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit a15d2a8c222d7d5b770cf82074d83a5398b3b375
Author: Kevin Brace 
Date:   Tue Aug 11 18:54:44 2020 -0700

Version bumped to 0.6.301

A minor fix to the build script.  No change in functionality.

Signed-off-by: Kevin Brace 

diff --git a/configure.ac b/configure.ac
index a4ae929..8adbd5d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-openchrome],
-[0.6.300],
+[0.6.301],
 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg=Driver/openchrome],
 [xf86-video-openchrome])
 
commit 4a8de6824c6ec910e7ab1c76c8391665632fad36
Author: Kevin Brace 
Date:   Tue Aug 11 18:50:13 2020 -0700

Adding Red Hat copyright to via_memmgr.h and via_memmgr.c

There are some similarities to X Server modesetting device driver's
dumb_bo.h and dumb_bo.c (/xserver/hw/xfree86/drivers/modesetting).

Signed-off-by: Kevin Brace 

diff --git a/src/via_memmgr.c b/src/via_memmgr.c
index 45bd2ba..fd3fc4a 100644
--- a/src/via_memmgr.c
+++ b/src/via_memmgr.c
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2007 Red Hat, Inc.
  * Copyright 2003 Red Hat, Inc. All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/src/via_memmgr.h b/src/via_memmgr.h
index e1be32d..aab7f78 100644
--- a/src/via_memmgr.h
+++ b/src/via_memmgr.h
@@ -1,5 +1,6 @@
 /*
  * Copyright 2011 James Simmons, All Rights Reserved.
+ * Copyright © 2007 Red Hat, Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
commit 3193273172f8ad178c2812103dd3aecf7d8494fc
Author: Kevin Brace 
Date:   Tue Aug 11 16:32:12 2020 -0700

Add openchrome_drm.h to the build script

Missing header file can cause packaging issues later.

Signed-off-by: Kevin Brace 

diff --git a/src/Makefile.am b/src/Makefile.am
index 553b9ab..3db8adc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -89,7 +89,8 @@ openchrome_drv_la_SOURCES += \
  via_kms.c \
  via_xvmc.c \
  via_xvmc.h \
- drm_fourcc.h
+ drm_fourcc.h \
+ openchrome_drm.h
 else
 EXTRA_DIST += \
  via_dri.c \
@@ -100,7 +101,8 @@ EXTRA_DIST += \
  via_kms.c \
  via_xvmc.c \
  via_xvmc.h \
- drm_fourcc.h
+ drm_fourcc.h \
+ openchrome_drm.h
 endif
 
 via_driver.lo: version.h
___
openchrome-devel mailing list
openchrome-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/openchrome-devel