Date: Sun, 28 Oct 2018 14:17:19 +0000 (UTC) From: Mark Linimon <linimon@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r483298 - in head/audio: drumgizmo/files wmmp/files Message-ID: <201810281417.w9SEHJYP086122@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: linimon Date: Sun Oct 28 14:17:19 2018 New Revision: 483298 URL: https://svnweb.freebsd.org/changeset/ports/483298 Log: Fix mismerge. Pointy hat to: linimon Modified: head/audio/drumgizmo/files/patch-drumgizmo_input_ossmidi.cc head/audio/drumgizmo/files/patch-drumgizmo_output_oss.cc head/audio/wmmp/files/patch-CMakeLists.txt Modified: head/audio/drumgizmo/files/patch-drumgizmo_input_ossmidi.cc ============================================================================== --- head/audio/drumgizmo/files/patch-drumgizmo_input_ossmidi.cc Sun Oct 28 14:15:40 2018 (r483297) +++ head/audio/drumgizmo/files/patch-drumgizmo_input_ossmidi.cc Sun Oct 28 14:17:19 2018 (r483298) @@ -8,13 +8,3 @@ static int const NOTE_ON = 0x90; ---- drumgizmo/input/ossmidi.cc.orig 2018-10-06 16:29:02 UTC -+++ drumgizmo/input/ossmidi.cc -@@ -30,6 +30,7 @@ - #include <stdlib.h> - #include <unistd.h> - #include <iostream> -+#include <cstring> - - - static int const NOTE_ON = 0x90; Modified: head/audio/drumgizmo/files/patch-drumgizmo_output_oss.cc ============================================================================== --- head/audio/drumgizmo/files/patch-drumgizmo_output_oss.cc Sun Oct 28 14:15:40 2018 (r483297) +++ head/audio/drumgizmo/files/patch-drumgizmo_output_oss.cc Sun Oct 28 14:17:19 2018 (r483298) @@ -8,13 +8,3 @@ OSSOutputEngine::OSSOutputEngine() ---- drumgizmo/output/oss.cc.orig 2018-10-06 16:27:27 UTC -+++ drumgizmo/output/oss.cc -@@ -30,6 +30,7 @@ - #include <stdlib.h> - #include <unistd.h> - #include <iostream> -+#include <cstring> - - - OSSOutputEngine::OSSOutputEngine() Modified: head/audio/wmmp/files/patch-CMakeLists.txt ============================================================================== --- head/audio/wmmp/files/patch-CMakeLists.txt Sun Oct 28 14:15:40 2018 (r483297) +++ head/audio/wmmp/files/patch-CMakeLists.txt Sun Oct 28 14:17:19 2018 (r483298) @@ -7,21 +7,3 @@ -set(CMAKE_C_FLAGS "-Oz") INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/doc/WMmp.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/bin/WMmp DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) ---- CMakeLists.txt.orig 2018-09-20 09:45:39 UTC -+++ CMakeLists.txt -@@ -15,6 +15,5 @@ find_package(X11 REQUIRED) - include_directories(${X11_INCLUDE_DIR}) - target_link_libraries(WMmp ${X11_LIBRARIES} ${X11_Xpm_LIB}) - --set(CMAKE_C_FLAGS "-Oz") - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/doc/WMmp.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/bin/WMmp DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) ---- CMakeLists.txt.orig 2018-09-20 09:45:39 UTC -+++ CMakeLists.txt -@@ -15,6 +15,5 @@ find_package(X11 REQUIRED) - include_directories(${X11_INCLUDE_DIR}) - target_link_libraries(WMmp ${X11_LIBRARIES} ${X11_Xpm_LIB}) - --set(CMAKE_C_FLAGS "-Oz") - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/doc/WMmp.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/bin/WMmp DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810281417.w9SEHJYP086122>