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 <kevinbr...@gmx.com>
Date: Tue Sep 1 16:32:28 2020 -0700
Version bumped to 0.6.309
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
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&component=Driver/openchrome],
[xf86-video-openchrome])
commit d80da6bbe39512183dcee990e771c1857b0fb9f6
Author: Kevin Brace <kevinbr...@gmx.com>
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 <kevinbr...@gmx.com>
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 <X11/extensions/dpms.h>
#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 <kevinbr...@gmx.com>
Date: Tue Sep 1 16:07:31 2020 -0700
Remove last vestiges of svn from the build script
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
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
