From 1e117672bb448157de73eb0ae4000cd671c988bd Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Sat, 23 Apr 2022 12:30:22 +0200 Subject: [PATCH] - Fix Authors - Drop CMake - Update ReadMe --- AUTHORS | 1 + CMakeLists.txt | 69 -------------------------------------------- NEWS | 3 ++ README | 5 ++-- README.md | 5 ++-- cmake/FindJACK.cmake | 28 ------------------ cmake/FindLASH.cmake | 27 ----------------- configure.ac | 2 +- 8 files changed, 11 insertions(+), 129 deletions(-) delete mode 100644 CMakeLists.txt delete mode 100644 cmake/FindJACK.cmake delete mode 100644 cmake/FindLASH.cmake diff --git a/AUTHORS b/AUTHORS index e117265..5c550c6 100644 --- a/AUTHORS +++ b/AUTHORS @@ -3,3 +3,4 @@ Hans Petter Selasky Jeff Snyder Dan Muresan Markus Schmidt +AlkorZ3 \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt deleted file mode 100644 index 4a2b853..0000000 --- a/CMakeLists.txt +++ /dev/null @@ -1,69 +0,0 @@ -# -# Copyright (c) 2011 Hans Petter Selasky. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# -# -# Makefile for Jack Keyboard -# -cmake_minimum_required(VERSION 2.8) - -set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/") -set(VERSION "2.7.2") - -set(JackEnable ON CACHE BOOL "Enable support for Jack") -set(LashEnable ON CACHE BOOL "Enable support for Lash") -set(X11Enable ON CACHE BOOL "Enable support for X11") - -project(jack-keyboard) - -add_executable(jack-keyboard src/jack-keyboard src/pianokeyboard) - -find_package(GTK2 2.2 REQUIRED gtk) -include_directories(${GTK2_INCLUDE_DIRS}) -target_link_libraries(jack-keyboard ${GTK2_LIBRARIES}) - -if(JackEnable) -find_package(JACK) -include_directories(${JACK_INCLUDE_DIR}) -target_link_libraries(jack-keyboard ${JACK_LIBRARIES}) -add_definitions(-DHAVE_JACK=1) -endif() - -if(LashEnable) -find_package(LASH) -include_directories(${LASH_INCLUDE_DIR}) -target_link_libraries(jack-keyboard ${LASH_LIBRARIES}) -add_definitions(-DHAVE_LASH=1) -endif() - -if(X11Enable) -find_package(X11) -include_directories(${X11_INCLUDE_DIR}) -target_link_libraries(jack-keyboard ${X11_LIBRARIES}) -add_definitions(-DHAVE_X11=1) -endif() - -install(TARGETS jack-keyboard RUNTIME DESTINATION bin) -install(FILES pixmaps/jack-keyboard.png DESTINATION share/pixmaps) -install(FILES src/jack-keyboard.desktop DESTINATION share/applications) -install(FILES man/jack-keyboard.1 DESTINATION man/man1) diff --git a/NEWS b/NEWS index 68def62..a39eb7a 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +User-visible changes between 2.7.2 and 2.8.0 include: + - Drop CMake and now use autotools + User-visible changes between 2.7.1 and 2.7.2 include: User-visible changes between 2.6 and 2.7.1 include: diff --git a/README b/README index 1f38d9a..b7506e4 100644 --- a/README +++ b/README @@ -15,8 +15,9 @@ If you're using FreeBSD, install from ports - audio/jack-keyboard. Otherwise, you need JACK with MIDI support, gtk+ 2.6 or higher, make(1), gcc and all the standard headers. Untar the file, type -'make install' and that's it. If there is any problem, drop me -an email (trasz@FreeBSD.org) and I will help you. Really. +'make install' and that's it. +If Makefile is not present, you can generate it with: +aclocal && autoheader && automake --add-missing && autoconf How to use it? -------------- diff --git a/README.md b/README.md index 4625be7..3b8675c 100644 --- a/README.md +++ b/README.md @@ -17,8 +17,9 @@ If you're using FreeBSD, install from ports - audio/jack-keyboard. Otherwise, you need JACK with MIDI support, gtk+ 2.6 or higher, make(1), gcc and all the standard headers. Untar the file, type -'make install' and that's it. If there is any problem, drop me -an email (trasz@FreeBSD.org) and I will help you. Really. +'make install' and that's it. +If Makefile is not present, you can generate it with: +aclocal && autoheader && automake --add-missing && autoconf ## How to use it? diff --git a/cmake/FindJACK.cmake b/cmake/FindJACK.cmake deleted file mode 100644 index 577107c..0000000 --- a/cmake/FindJACK.cmake +++ /dev/null @@ -1,28 +0,0 @@ -# - Try to find Jack library -# Once done this will define: -# JACK_FOUND - system has JACK -# JACK_INCLUDE_DIR - incude paths to use -# JACK_LIBRARIES - Link these to use - -SET(JACK_FOUND 0) - -FIND_PATH(JACK_INCLUDE_DIR jack/ringbuffer.h - /usr/local/include - /usr/include -) - -FIND_LIBRARY(JACK_LIBRARIES jack - /usr/local/lib - /usr/lib -) - -# handle the QUIETLY and REQUIRED arguments and set JACK_FOUND to TRUE -# if all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(JACK DEFAULT_MSG JACK_LIBRARIES JACK_INCLUDE_DIR) - -MARK_AS_ADVANCED( - JACK_INCLUDE_DIR - JACK_LIBRARIES -) - diff --git a/cmake/FindLASH.cmake b/cmake/FindLASH.cmake deleted file mode 100644 index 7b47beb..0000000 --- a/cmake/FindLASH.cmake +++ /dev/null @@ -1,27 +0,0 @@ -# - Try to find Lash library -# Once done this will define: -# LASH_FOUND - system has LASH -# LASH_INCLUDE_DIR - incude paths to use -# LASH_LIBRARIES - Link these to use - -SET(LASH_FOUND 0) - -FIND_PATH(LASH_INCLUDE_DIR lash/lash.h - /usr/local/include/lash-1.0 - /usr/include/lash-1.0 -) - -FIND_LIBRARY(LASH_LIBRARIES lash - /usr/local/lib - /usr/lib -) - -# handle the QUIETLY and REQUIRED arguments and set LASH_FOUND to TRUE -# if all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(LASH DEFAULT_MSG LASH_LIBRARIES LASH_INCLUDE_DIR) - -MARK_AS_ADVANCED( - LASH_INCLUDE_DIR - LASH_LIBRARIES -) diff --git a/configure.ac b/configure.ac index bcc8aeb..a4cf5a1 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([jack-keyboard], [2.5], [trasz@FreeBSD.org]) +AC_INIT([jack-keyboard], [2.8], [alkorz3@rx3.net]) AM_INIT_AUTOMAKE([-Wall foreign]) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADERS([config.h])