diff --git a/.gitignore b/.gitignore index f0423a8..2b709ba 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,6 @@ aclocal.m4 autom4te.cache/ autoscan.log -ChangeLog compile config.guess config.h diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..e69de29 diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..e69de29 diff --git a/Makefile.am b/Makefile.am index 0eaca96..9f0d419 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,36 +1 @@ -# Copyright 2005 Adam Jackson. -# -# 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 -# on the rights to use, copy, modify, merge, publish, distribute, sub -# license, 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 NON-INFRINGEMENT. IN NO EVENT SHALL -# ADAM JACKSON 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. - -# During distcheck, system locations (as provided by pkg-config) may -# not be writable; provide instead relative locations. -DISTCHECK_CONFIGURE_FLAGS = --with-xorg-module-dir='$${libdir}/xorg/modules' - SUBDIRS = src man -MAINTAINERCLEANFILES = ChangeLog INSTALL - -.PHONY: ChangeLog INSTALL - -INSTALL: - $(INSTALL_CMD) - -ChangeLog: - $(CHANGELOG_CMD) - -dist-hook: ChangeLog INSTALL diff --git a/NEWS b/NEWS new file mode 100644 index 0000000..e69de29 diff --git a/configure.ac b/configure.ac index dc3a74c..a12968b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,65 +1,10 @@ -# Copyright 2005 Adam Jackson. -# -# 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 -# on the rights to use, copy, modify, merge, publish, distribute, sub -# license, 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 NON-INFRINGEMENT. IN NO EVENT SHALL -# ADAM JACKSON 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. -# -# Process this file with autoconf to produce a configure script - -# Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xlibre-xf86-video-v4l], [25.0.0], [https://github.com/X11Libre/xf86-video-v4l/issues], [xlibre-xf86-video-v4l]) -AC_CONFIG_SRCDIR([Makefile.am]) -AC_CONFIG_HEADERS([config.h]) -AC_CONFIG_AUX_DIR(.) -# Initialize Automake -AM_INIT_AUTOMAKE([foreign dist-xz]) - -# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS -m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.8) -XORG_DEFAULT_OPTIONS - -# Initialize libtool -LT_INIT([disable-static]) - -AH_TOP([#include "xorg-server.h"]) - -# Define a configure option for an alternate module directory -PKG_PROG_PKG_CONFIG([0.25]) -AC_ARG_WITH(xorg-module-dir, - AS_HELP_STRING([--with-xorg-module-dir=DIR], - [Default xorg module directory]), - [moduledir="$withval"], - [moduledir=`$PKG_CONFIG --variable=moduledir xorg-server`]) - -# Store the list of server defined optional extensions in REQUIRED_MODULES -XORG_DRIVER_CHECK_EXT(RANDR, randrproto) -XORG_DRIVER_CHECK_EXT(XV, videoproto) - -# Obtain compiler/linker options for the driver dependencies -PKG_CHECK_MODULES(XORG, [xorg-server >= 25.0.0 xproto $REQUIRED_MODULES]) - -AC_SUBST([moduledir]) +XLIBRE_INIT_MODULE_AM(v4l) AC_CONFIG_FILES([Makefile src/Makefile man/Makefile]) AC_OUTPUT diff --git a/man/Makefile.am b/man/Makefile.am index adf6926..7e77e8f 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,41 +1,12 @@ +# SPDX-License-Identifier: MIT OR X11 # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright © 2026 Enrico Weigelt, metux IT consult # -# 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. -# -drivermandir = $(DRIVER_MAN_DIR) +drvmandir = @xlibre_driver_man_dir@ +drvman_DATA = @xlibre_driver_name@.@xlibre_driver_man_section@ -driverman_PRE = v4l.man +CLEANFILES = $(drvman_DATA) -driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@) - -EXTRA_DIST = v4l.man - -CLEANFILES = $(driverman_DATA) - - -# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure - - -SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man - -.man.$(DRIVER_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ +.man.@xlibre_driver_man_section@: + cp $< $@ diff --git a/man/v4l.man b/man/v4l.man index 5e555d5..e4fa0fb 100644 --- a/man/v4l.man +++ b/man/v4l.man @@ -1,6 +1,6 @@ .\" shorthand for double quote that works everywhere. .ds q \N'34' -.TH V4L 4 2009-01-09 __vendorversion__ +.TH V4L 4 2026-01-30 "X Version 11" .SH NAME v4l \- video4linux driver .SH SYNOPSIS diff --git a/src/Makefile.am b/src/Makefile.am index 65263cc..4facd56 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,33 +1,12 @@ -# Copyright 2005 Adam Jackson. +# SPDX-License-Identifier: MIT OR X11 # -# 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 -# on the rights to use, copy, modify, merge, publish, distribute, sub -# license, 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: +# Copyright © 2026 Enrico Weigelt, metux IT consult # -# 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 NON-INFRINGEMENT. IN NO EVENT SHALL -# ADAM JACKSON 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. -# this is obnoxious: -# -module lets us name the module exactly how we want -# -avoid-version prevents gratuitous .0.0.0 version numbers on the end -# _ladir passes a dummy rpath to libtool so the thing will actually link -# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. -AM_CFLAGS = $(BASE_CFLAGS) $(XORG_CFLAGS) +AM_CFLAGS = $(XLIBRE_SERVER_CFLAGS) + v4l_drv_la_LTLIBRARIES = v4l_drv.la -v4l_drv_la_LDFLAGS = -module -avoid-version -v4l_drv_ladir = @moduledir@/drivers +v4l_drv_la_LDFLAGS = -module -avoid-version +v4l_drv_ladir = @xlibre_video_drivers_dir@ -v4l_drv_la_SOURCES = \ - v4l.c \ - videodev2.h +v4l_drv_la_SOURCES = v4l.c videodev2.h