From nobody Wed Sep 7 17:23:10 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MN8Gl1s8Xz4bh9y; Wed, 7 Sep 2022 17:23:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MN8Gl1Btnz45FJ; Wed, 7 Sep 2022 17:23:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662571391; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hDft9xsFiP3L4Tu1PRlzg9VJDMbEBqAlTsQuNFRL2ME=; b=sXU/9yqwmPfMjcl+TNsYIWYeDbYwLYqHjZnil4TkZDOpilQ2HaIWd8bjzviFmSnEARbWHM /GGnD0drHfjlnXzGKfnhbWY39bQE2PIJ6S7exuX3N5ViwfoPtnYWe3shVpW5oZayz5+bOH 8dNB62uewlsL+6LPJICbIuoi6j8w2Gv3GfxgkOhf5qyADtU6X7WmGtOYeK17b1NS+IZXl2 hSh0p/15xkr6fj81ThzBzCvBYsXdpUNuCZUYDUMCQkx3dLWDVGhBejheVKGSBebJo9xCCP m+egkwOnmWGTIP6ClV3ISXUh3pjMgB5CrN4o8rTvKNAc11cbBX29JAM3XvgBig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MN8Gl0GDMzbjK; Wed, 7 Sep 2022 17:23:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 287HNABX091036; Wed, 7 Sep 2022 17:23:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 287HNAQq091035; Wed, 7 Sep 2022 17:23:10 GMT (envelope-from git) Date: Wed, 7 Sep 2022 17:23:10 GMT Message-Id: <202209071723.287HNAQq091035@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: c325f70161eb - main - graphics/milton: fix build with SDL2 2.24.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c325f70161ebd084691806a572e8e388239c509a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662571391; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hDft9xsFiP3L4Tu1PRlzg9VJDMbEBqAlTsQuNFRL2ME=; b=dbbuT+f3I6maWQuRCvkowOgsqTCgE4oq1+rqV/6mXrL3eYvYxluuCFXzYUVHkhx0wMKxJI W8PlyHH2b0kbTh+dU3PkTRIl0BVErcTHQJFGmIiV5WKY8aRlj76oiQ/EEA6rBDL5gZq/vX T3P7EKOd0vQVEDgup4HqinNUO1++qBcm2T5MaMYhhKPMqx+8+Ok47dOzf12UK1H3WY+eAV /+hSkTrskLJGgZYBvc0K+F4RYH6P5sj2+E7K/9FU1PiYg95vbiqNmsdNDJoXIQi4F3jUMS WNlE5NiSb8KMWhwxnrtzuVyJxhZjBFY7v9ZHipsYGEaXcY2k/TNTlVcUMQCUWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662571391; a=rsa-sha256; cv=none; b=OLMwha34gJzsKcVJREXWwRItMryGleKYt83AYyO6qqHxSFm8TW3jWHQzgRE3mANZIi82pI sG5TF5Ko0xi7++Njo/cJH8kYjQv572P6AbraPfB6MP2GzLIzMePeAALz52S1n8QBm7WVF+ UnbwN+0QO9GN+rnspDKnEe+rarQ8uW0XGb1mrOq8xu7lrLj9Qdd9rYnoJDAA+yltyqUdAO dkSrzCsD35DlxvXpQ55NKR6GlgUWYjrGkuRr+lT3ivv5Kc2nipdemervBcn7yyrLJ8l8Uk P+zleMAY9VoHiuc0ebUOdEmagT/j0cR0sq3UJRuIWoKWXdW6tfbKSpHT3/UFsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=c325f70161ebd084691806a572e8e388239c509a commit c325f70161ebd084691806a572e8e388239c509a Author: Dmitry Marakasov AuthorDate: 2022-09-07 15:22:37 +0000 Commit: Dmitry Marakasov CommitDate: 2022-09-07 17:22:36 +0000 graphics/milton: fix build with SDL2 2.24.0 --- graphics/milton/files/patch-CMakeLists.txt | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/graphics/milton/files/patch-CMakeLists.txt b/graphics/milton/files/patch-CMakeLists.txt index d619b8e3f494..66957d412056 100644 --- a/graphics/milton/files/patch-CMakeLists.txt +++ b/graphics/milton/files/patch-CMakeLists.txt @@ -1,4 +1,4 @@ ---- CMakeLists.txt.orig 2019-03-15 04:11:43 UTC +--- CMakeLists.txt.orig 2019-10-27 22:02:14 UTC +++ CMakeLists.txt @@ -41,7 +41,7 @@ else() endif() @@ -9,7 +9,7 @@ message(STATUS "Building ${CMAKE_BUILD_TYPE}") -@@ -71,13 +71,14 @@ if(UNIX) +@@ -71,13 +71,15 @@ if(UNIX) ${UnixCFlags}) endif() @@ -22,29 +22,30 @@ find_library(XINPUT_LIBRARY libXi.so) find_package(Threads REQUIRED) + find_package(SDL2 REQUIRED) ++ find_package(SDL2_image REQUIRED) if(XINPUT_LIBRARY STREQUAL "XINPUT_LIBRARY-NOTFOUND") message(FATAL_ERROR "Could not find libXi.so") -@@ -98,7 +99,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") +@@ -98,7 +100,6 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") target_include_directories(Milton PRIVATE ${GTK2_INCLUDE_DIRS} ${X11_INCLUDE_DIR} - ${SDL2DIR}/build/linux64/include/SDL2 -+ ${SDL2_INCLUDE_DIRS} ${OPENGL_INCLUDE_DIR} ) -@@ -107,8 +108,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") +@@ -107,8 +108,8 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") ${X11_LIBRARIES} ${OPENGL_LIBRARIES} ${XINPUT_LIBRARY} - ${SDL2DIR}/build/linux64/lib/libSDL2maind.a - ${SDL2DIR}/build/linux64/lib/libSDL2d.a -+ ${SDL2_LIBRARIES} SDL2_image ++ SDL2::SDL2 ++ SDL2_image::SDL2_image ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS} ) -@@ -132,11 +132,8 @@ if(WIN32 OR APPLE) +@@ -132,11 +133,8 @@ if(WIN32 OR APPLE) endif() add_custom_command(TARGET Milton POST_BUILD