diff options
author | Rob Clark <robdclark@chromium.org> | 2020-02-28 16:49:01 -0800 |
---|---|---|
committer | Rob Clark <robdclark@chromium.org> | 2020-03-07 09:22:17 -0800 |
commit | b1852df7b4efc841431e83547e67f019d5c351d4 (patch) | |
tree | 95f85dc07d9700e0024f0cff624d0bef1b866b3d | |
parent | b235bae4c674b6ef4ac15a40b46000876bee9425 (diff) |
remove autotools build
We've had meson for a while. And too lazy to update autotools build.
So lets just drop it.
-rw-r--r-- | .gitlab-ci.yml | 56 | ||||
-rw-r--r-- | Makefile.am | 70 | ||||
-rwxr-xr-x | autogen.sh | 20 | ||||
-rw-r--r-- | configure.ac | 53 |
4 files changed, 0 insertions, 199 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 83f6034..7693296 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,21 +3,10 @@ paths: - _build/meson-logs -.artifacts-autotools: &artifacts-autotools - when: always - paths: - - _build/*.log - .meson-build: &meson-build - meson _build -D auto_features=enabled - ninja -C _build -.autotools-build: &autotools-build - - mkdir _build - - cd _build - - ../autogen.sh - - make - latest-meson: stage: build image: archlinux/base:latest @@ -33,21 +22,6 @@ latest-meson: libpng script: *meson-build -latest-autotools: - stage: build - image: archlinux/base:latest - artifacts: *artifacts-autotools - before_script: - - pacman -Syu --noconfirm --needed - base-devel - libdrm - mesa - gstreamer - gst-plugins-base - libpng - git # autogen.sh depends on git - script: *autotools-build - oldest-meson: stage: build image: debian:stable @@ -79,33 +53,3 @@ oldest-meson: - pip3 install meson==0.47 script: *meson-build -oldest-autotools: - stage: build - image: debian:stable - artifacts: *artifacts-autotools - before_script: - - printf > /etc/dpkg/dpkg.cfg.d/99-exclude-cruft "%s\n" - 'path-exclude=/usr/share/doc/*' - 'path-exclude=/usr/share/man/*' - - printf > /usr/sbin/policy-rc.d "%s\n" - '#!/bin/sh' - 'exit 101' - - chmod +x /usr/sbin/policy-rc.d - - apt-get update - - apt-get -y --no-install-recommends install - build-essential - automake - autoconf - libtool - pkg-config - libdrm-dev - libgbm-dev - libegl1-mesa-dev - libgles2-mesa-dev - libgstreamer1.0-dev - libgstreamer-plugins-base1.0-dev - gstreamer1.0-plugins-base - gstreamer1.0-plugins-base-apps - libpng-dev - git # autogen.sh depends on git - script: *autotools-build diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index ba064e4..0000000 --- a/Makefile.am +++ /dev/null @@ -1,70 +0,0 @@ -# -# Copyright (c) 2012 Rob Clark <rob@ti.com> -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. -# - -bin_PROGRAMS = kmscube texturator - -kmscube_LDADD = \ - $(DRM_LIBS) \ - $(GBM_LIBS) \ - $(EGL_LIBS) \ - $(GLES2_LIBS) \ - -lm - -kmscube_CFLAGS = \ - -O0 -g \ - -Wall -Wextra \ - -std=c99 \ - $(DRM_CFLAGS) \ - $(GBM_CFLAGS) \ - $(EGL_CFLAGS) \ - $(GLES2_CFLAGS) - -kmscube_SOURCES = \ - common.c \ - common.h \ - cube-smooth.c \ - cube-tex.c \ - drm-atomic.c \ - drm-common.c \ - drm-common.h \ - drm-legacy.c \ - esTransform.c \ - esUtil.h \ - frame-512x512-NV12.c \ - frame-512x512-RGBA.c \ - kmscube.c - -if ENABLE_GST -kmscube_LDADD += $(GST_LIBS) -kmscube_CFLAGS += $(GST_CFLAGS) -kmscube_SOURCES += cube-video.c gst-decoder.c -endif - -texturator_LDADD = $(kmscube_LDADD) -texturator_CFLAGS = $(kmscube_CFLAGS) -texturator_SOURCES = \ - common.c \ - common.h \ - drm-common.c \ - drm-legacy.c \ - texturator.c diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index d83c1fc..0000000 --- a/autogen.sh +++ /dev/null @@ -1,20 +0,0 @@ -#! /bin/sh - -srcdir=`dirname "$0"` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd "$srcdir" - -git config --local --get format.subjectPrefix >/dev/null || - git config --local format.subjectPrefix "PATCH kmscube" 2>/dev/null - -git config --local --get sendemail.to >/dev/null || - git config --local sendemail.to "mesa-dev@lists.freedesktop.org" 2>/dev/null - -autoreconf --force --verbose --install || exit 1 -cd "$ORIGDIR" || exit $? - -if test -z "$NOCONFIGURE"; then - exec "$srcdir"/configure "$@" -fi diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 6be6541..0000000 --- a/configure.ac +++ /dev/null @@ -1,53 +0,0 @@ -# -# Copyright (c) 2012 Rob Clark <rob@ti.com> -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. -# - -# Initialize Autoconf -AC_PREREQ([2.60]) -AC_INIT([kmscube], [0.0.1], [https://gitlab.freedesktop.org/mesa/kmscube/], [kmscube]) -AC_CONFIG_AUX_DIR([build-aux]) - -# Initialize Automake -AM_INIT_AUTOMAKE([foreign dist-bzip2]) - -AC_PROG_CC - -# Enable quiet compiles on automake 1.11. -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - -# Obtain compiler/linker options for depedencies -PKG_CHECK_MODULES(DRM, [libdrm >= 2.4.71]) -PKG_CHECK_MODULES(GBM, gbm >= 13.0) -PKG_CHECK_MODULES(EGL, egl) -PKG_CHECK_MODULES(GLES2, glesv2) - -# Check for gst and enable cube-video conditionally: -PKG_CHECK_MODULES(GST, gstreamer-1.0 >= 1.6.0 gstreamer-plugins-base-1.0 >= 1.6.0 gstreamer-app-1.0 >= 1.6.0 gstreamer-allocators-1.0 >= 1.6.0 gstreamer-video-1.0 >= 1.6.0 glib-2.0, - [HAVE_GST=yes], [HAVE_GST=no]) -if test "x$HAVE_GST" = "xyes"; then - AC_DEFINE(HAVE_GST, 1, [Have GStreamer support]) - AC_MSG_NOTICE([Building cube-video support]) -fi -AM_CONDITIONAL(ENABLE_GST, [test "x$HAVE_GST" = "xyes"]) - -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT |