mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-30 05:40:06 +00:00
Code Issues Releases Activity

Fix mismerge.

Browse Source 
Pointy hat to:	linimon
This commit is contained in:
Mark Linimon 2018-10-28 14:17:19 +00:00
parent 2414437490
commit 85d0026b9f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=483298
3 changed files with 0 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
audio/drumgizmo/files/patch-drumgizmo_input_ossmidi.cc
View File

@ -7,14 +7,4 @@
+#include <cstring>
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;

10
audio/drumgizmo/files/patch-drumgizmo_output_oss.cc
View File

@ -7,14 +7,4 @@
+#include <cstring>
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()

18
audio/wmmp/files/patch-CMakeLists.txt
View File

@ -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)