1 |
flameeyes 08/02/14 14:49:47 |
2 |
|
3 |
Added: ladspa-sdk-1.13-properbuild.patch |
4 |
Log: |
5 |
Revision bump, use a new patch to handle the makefile, sent upstream hoping for it to be integrated in the next release. This also solves bug #209718 as it respect LDFLAGS (and also LD now). |
6 |
(Portage version: 2.1.4.4) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 media-libs/ladspa-sdk/files/ladspa-sdk-1.13-properbuild.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/ladspa-sdk/files/ladspa-sdk-1.13-properbuild.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/ladspa-sdk/files/ladspa-sdk-1.13-properbuild.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: ladspa-sdk-1.13-properbuild.patch |
15 |
=================================================================== |
16 |
Index: ladspa_sdk/src/makefile |
17 |
=================================================================== |
18 |
--- ladspa_sdk.orig/src/makefile |
19 |
+++ ladspa_sdk/src/makefile |
20 |
@@ -13,10 +13,12 @@ INSTALL_BINARY_DIR = /usr/bin/ |
21 |
# GENERAL |
22 |
# |
23 |
|
24 |
+CFLAGS = -Wall -Werror -O3 |
25 |
+CXXFLAGS = -Wall -Werror -O3 |
26 |
+ |
27 |
INCLUDES = -I. |
28 |
-LIBRARIES = -ldl -lm |
29 |
-CFLAGS = $(INCLUDES) -Wall -Werror -O3 -fPIC |
30 |
-CXXFLAGS = $(CFLAGS) |
31 |
+DYNAMIC_LD_LIBS = -ldl |
32 |
+LIBRARIES = $(DYNAMIC_LD_LIBS) -lm |
33 |
PLUGINS = ../plugins/amp.so \ |
34 |
../plugins/delay.so \ |
35 |
../plugins/filter.so \ |
36 |
@@ -26,7 +28,8 @@ PROGRAMS = ../bin/analyseplugin \ |
37 |
../bin/applyplugin \ |
38 |
../bin/listplugins |
39 |
CC = cc |
40 |
-CPP = c++ |
41 |
+CXX = c++ |
42 |
+MKDIR_P = mkdirhier |
43 |
|
44 |
############################################################################### |
45 |
# |
46 |
@@ -34,12 +37,12 @@ CPP = c++ |
47 |
# |
48 |
|
49 |
../plugins/%.so: plugins/%.c ladspa.h |
50 |
- $(CC) $(CFLAGS) -o plugins/$*.o -c plugins/$*.c |
51 |
- $(LD) -o ../plugins/$*.so plugins/$*.o -shared |
52 |
+ $(CC) $(CFLAGS) $(INCLUDES) -fPIC -o plugins/$*.o -c plugins/$*.c |
53 |
+ $(LD) $(RAW_LDFLAGS) -o ../plugins/$*.so plugins/$*.o -shared |
54 |
|
55 |
../plugins/%.so: plugins/%.cpp ladspa.h |
56 |
- $(CPP) $(CXXFLAGS) -o plugins/$*.o -c plugins/$*.cpp |
57 |
- $(CPP) -o ../plugins/$*.so plugins/$*.o -shared |
58 |
+ $(CXX) $(CXXFLAGS) $(INCLUDES) -fPIC -o plugins/$*.o -c plugins/$*.cpp |
59 |
+ $(CXX) $(LDFLAGS) -o ../plugins/$*.so plugins/$*.o -shared |
60 |
|
61 |
############################################################################### |
62 |
# |
63 |
@@ -59,12 +62,12 @@ test: /tmp/test.wav ../snd/noise.wav alw |
64 |
@echo Test complete. |
65 |
|
66 |
install: targets |
67 |
- -mkdirhier $(INSTALL_PLUGINS_DIR) |
68 |
- -mkdirhier $(INSTALL_INCLUDE_DIR) |
69 |
- -mkdirhier $(INSTALL_BINARY_DIR) |
70 |
- cp ../plugins/* $(INSTALL_PLUGINS_DIR) |
71 |
- cp ladspa.h $(INSTALL_INCLUDE_DIR) |
72 |
- cp ../bin/* $(INSTALL_BINARY_DIR) |
73 |
+ -$(MKDIR_P) $(DESTDIR)$(INSTALL_PLUGINS_DIR) |
74 |
+ -$(MKDIR_P) $(DESTDIR)$(INSTALL_INCLUDE_DIR) |
75 |
+ -$(MKDIR_P) $(DESTDIR)$(INSTALL_BINARY_DIR) |
76 |
+ cp ../plugins/* $(DESTDIR)$(INSTALL_PLUGINS_DIR) |
77 |
+ cp ladspa.h $(DESTDIR)$(INSTALL_INCLUDE_DIR) |
78 |
+ cp ../bin/* $(DESTDIR)$(INSTALL_BINARY_DIR) |
79 |
|
80 |
/tmp/test.wav: targets ../snd/noise.wav |
81 |
../bin/listplugins |
82 |
@@ -90,19 +93,19 @@ targets: $(PLUGINS) $(PROGRAMS) |
83 |
# |
84 |
|
85 |
../bin/applyplugin: applyplugin.o load.o default.o |
86 |
- $(CC) $(CFLAGS) $(LIBRARIES) \ |
87 |
+ $(CC) $(CFLAGS) $(INCLUDES) $(LDFLAGS) \ |
88 |
-o ../bin/applyplugin \ |
89 |
- applyplugin.o load.o default.o |
90 |
+ applyplugin.o load.o default.o $(LIBRARIES) |
91 |
|
92 |
../bin/analyseplugin: analyseplugin.o load.o default.o |
93 |
- $(CC) $(CFLAGS) $(LIBRARIES) \ |
94 |
+ $(CC) $(CFLAGS) $(INCLUDES) $(LDFLAGS) \ |
95 |
-o ../bin/analyseplugin \ |
96 |
- analyseplugin.o load.o default.o |
97 |
+ analyseplugin.o load.o default.o $(LIBRARIES) |
98 |
|
99 |
../bin/listplugins: listplugins.o search.o |
100 |
- $(CC) $(CFLAGS) $(LIBRARIES) \ |
101 |
+ $(CC) $(CFLAGS) $(INCLUDES) $(LDFLAGS) \ |
102 |
-o ../bin/listplugins \ |
103 |
- listplugins.o search.o |
104 |
+ listplugins.o search.o $(LIBRARIES) |
105 |
|
106 |
############################################################################### |
107 |
# |
108 |
|
109 |
|
110 |
|
111 |
-- |
112 |
gentoo-commits@l.g.o mailing list |