unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
blob 64d6dcaf15bd808101fd43a5eb109f13547cb547 3686 bytes (raw)
name: gnu/packages/patches/extempore-unbundle-external-dependencies.patch 	 # note: path name is non-authoritative(*)

  1
  2
  3
  4
  5
  6
  7
  8
  9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 89e6125e..c5e90750 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,7 +36,7 @@ endif()
 if(PACKAGE)
   # this needs to be set before project() is called
   set(CMAKE_OSX_DEPLOYMENT_TARGET 10.12)
-  set(ASSETS ON) # necessary for packaging
+  set(ASSETS OFF) # necessary for packaging
   message(STATUS "Building Extempore for binary distribution (assets directory will be downloaded)")
 endif()
 
@@ -134,71 +134,6 @@ else()
   message(FATAL_ERROR "Sorry, Extempore isn't supported on this platform - macOS, Linux & Windows only.")
 endif()
 
-########
-# PCRE #
-########
-
-# current in-tree PCRE version: 8.38
-
-add_library(pcre STATIC
-  # headers
-  src/pcre/config.h
-  src/pcre/pcre.h
-  src/pcre/ucp.h
-  # source files
-  src/pcre/pcre_chartables.c
-  src/pcre/pcre_compile.c
-  src/pcre/pcre_exec.c
-  src/pcre/pcre_globals.c
-  src/pcre/pcre_internal.h
-  src/pcre/pcre_newline.c
-  src/pcre/pcre_tables.c
-  )
-
-target_compile_definitions(pcre
-  PRIVATE -DHAVE_CONFIG_H
-  )
-
-if(PACKAGE)
-  target_compile_options(pcre
-    PRIVATE -mtune=generic)
-endif()
-
-#############
-# portaudio #
-#############
-
-add_library(portaudio STATIC
-  src/portaudio/src/common/pa_allocation.c
-  src/portaudio/src/common/pa_allocation.h
-  src/portaudio/src/common/pa_converters.c
-  src/portaudio/src/common/pa_converters.h
-  src/portaudio/src/common/pa_cpuload.c
-  src/portaudio/src/common/pa_cpuload.h
-  src/portaudio/src/common/pa_debugprint.c
-  src/portaudio/src/common/pa_debugprint.h
-  src/portaudio/src/common/pa_dither.c
-  src/portaudio/src/common/pa_dither.h
-  src/portaudio/src/common/pa_endianness.h
-  src/portaudio/src/common/pa_front.c
-  src/portaudio/src/common/pa_hostapi.h
-  src/portaudio/src/common/pa_memorybarrier.h
-  src/portaudio/src/common/pa_process.c
-  src/portaudio/src/common/pa_process.h
-  src/portaudio/src/common/pa_ringbuffer.c
-  src/portaudio/src/common/pa_ringbuffer.h
-  src/portaudio/src/common/pa_stream.c
-  src/portaudio/src/common/pa_stream.h
-  src/portaudio/src/common/pa_trace.c
-  src/portaudio/src/common/pa_trace.h
-  src/portaudio/src/common/pa_types.h
-  src/portaudio/src/common/pa_util.h
-  )
-
-target_include_directories(portaudio
-  PRIVATE src/portaudio/include
-  PRIVATE src/portaudio/src/common)
-
 # platform-specific
 
 if(APPLE)
@@ -224,25 +159,8 @@ if(APPLE)
 
 elseif(UNIX AND NOT APPLE)
   # use ALSA on Linux
-  target_sources(portaudio
-    PRIVATE src/portaudio/src/hostapi/alsa/pa_linux_alsa.c
-    PRIVATE src/portaudio/src/os/unix/pa_unix_hostapis.c
-    PRIVATE src/portaudio/src/os/unix/pa_unix_util.c
-    )
-  target_include_directories(portaudio
-    PRIVATE src/portaudio/src/os/unix)
-  target_compile_definitions(portaudio
-    PRIVATE -DPA_USE_ALSA)
-  target_link_libraries(portaudio
-    PRIVATE asound)
 
   if(JACK)
-    target_sources(portaudio
-      PRIVATE src/portaudio/src/hostapi/jack/pa_jack.c)
-    target_compile_definitions(portaudio
-      PRIVATE -DPA_USE_JACK)
-    target_link_libraries(portaudio
-      PRIVATE jack)
   endif()
 
 elseif(WIN32)
@@ -292,8 +210,6 @@ if(ASIO)
 endif()
 
 if(PACKAGE)
-  target_compile_options(portaudio
-    PRIVATE -mtune=generic)
 endif()
 
 ##############
@@ -411,8 +327,6 @@ endif()
 
 # dependencies
 
-add_dependencies(extempore pcre portaudio)
-
 if(BUILD_LLVM)
   if(WIN32)
     add_dependencies(extempore LLVM-install)
@@ -553,7 +467,7 @@ else()
   install(TARGETS extempore
     RUNTIME
     DESTINATION ".")
-  install(DIRECTORY assets runtime libs examples tests
+  install(DIRECTORY runtime libs examples
     DESTINATION "."
     PATTERN ".DS_Store" EXCLUDE)
 endif()

debug log:

solving 64d6dcaf15 ...
found 64d6dcaf15 in https://yhetil.org/guix-patches/20200420215617.12194-4-goodoldpaul@autistici.org/

applying [1/1] https://yhetil.org/guix-patches/20200420215617.12194-4-goodoldpaul@autistici.org/
diff --git a/gnu/packages/patches/extempore-unbundle-external-dependencies.patch b/gnu/packages/patches/extempore-unbundle-external-dependencies.patch
new file mode 100644
index 0000000000..64d6dcaf15

1:19: trailing whitespace.
 
1:23: trailing whitespace.
 
1:90: trailing whitespace.
 
1:93: trailing whitespace.
 
1:107: trailing whitespace.
 
Checking patch gnu/packages/patches/extempore-unbundle-external-dependencies.patch...
Applied patch gnu/packages/patches/extempore-unbundle-external-dependencies.patch cleanly.
warning: squelched 5 whitespace errors
warning: 10 lines add whitespace errors.

index at:
100644 64d6dcaf15bd808101fd43a5eb109f13547cb547	gnu/packages/patches/extempore-unbundle-external-dependencies.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).