Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/zita-convolver/files/
Date: Sun, 29 Dec 2019 09:10:00
Message-Id: 1577610589.5924f08e7c322034380810911fc5bf0bfd1d654b.fordfrog@gentoo
1 commit: 5924f08e7c322034380810911fc5bf0bfd1d654b
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Sun Dec 29 08:58:38 2019 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 29 09:09:49 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5924f08e
7
8 media-libs/zita-convolver: remove unused patches
9
10 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
11 Closes: https://github.com/gentoo/gentoo/pull/14162
12 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
13
14 .../files/zita-convolver-2.0.0-makefile.patch | 33 ----------------------
15 .../files/zita-convolver-3.1.0-makefile.patch | 32 ---------------------
16 2 files changed, 65 deletions(-)
17
18 diff --git a/media-libs/zita-convolver/files/zita-convolver-2.0.0-makefile.patch b/media-libs/zita-convolver/files/zita-convolver-2.0.0-makefile.patch
19 deleted file mode 100644
20 index 46c44173e8a..00000000000
21 --- a/media-libs/zita-convolver/files/zita-convolver-2.0.0-makefile.patch
22 +++ /dev/null
23 @@ -1,33 +0,0 @@
24 ---- libs/Makefile.orig 2015-10-16 16:00:45.639918246 +0100
25 -+++ libs/Makefile 2015-10-28 15:52:17.539967709 +0000
26 -@@ -28,9 +28,8 @@
27 - DISTDIR = zita-convolver-$(VERSION)
28 -
29 -
30 --CPPFLAGS += -Wall -I. -fPIC -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -O3
31 --CPPFLAGS += -mmmx -msse -mfpmath=sse -ffast-math -funroll-loops -fpermissive
32 --CPPFLAGS += -march=i686
33 -+CPPFLAGS += -Wall -I. -fPIC -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
34 -+CXXFLAGS += -ffast-math
35 - #CPPFLAGS += -DVECTORIZE
36 -
37 - LDLFAGS +=
38 -@@ -46,7 +45,7 @@
39 -
40 -
41 - $(ZITA-CONVOLVER_MIN): $(ZITA-CONVOLVER_O)
42 -- g++ -shared $(LDFLAGS) -Wl,-soname,$(ZITA-CONVOLVER_MAJ) -o $(ZITA-CONVOLVER_MIN) $(ZITA-CONVOLVER_O) $(ZITA-CONVOLVER_DEP)
43 -+ $(CXX) -shared $(LDFLAGS) -Wl,-soname,$(ZITA-CONVOLVER_MAJ) -o $(ZITA-CONVOLVER_MIN) $(ZITA-CONVOLVER_O) $(ZITA-CONVOLVER_DEP)
44 -
45 -
46 - install: $(ZITA-CONVOLVER_MIN)
47 -@@ -54,8 +53,8 @@
48 - install -d $(PREFIX)/$(LIBDIR)
49 - install -m 644 $(ZITA-CONVOLVER_H) $(PREFIX)/include
50 - install -m 755 $(ZITA-CONVOLVER_MIN) $(PREFIX)/$(LIBDIR)
51 -- ldconfig
52 - ln -sf $(ZITA-CONVOLVER_MIN) $(PREFIX)/$(LIBDIR)/$(ZITA-CONVOLVER_SO)
53 -+ ln -sf $(ZITA-CONVOLVER_MIN) $(PREFIX)/$(LIBDIR)/$(ZITA-CONVOLVER_MAJ)
54 -
55 -
56 - clean:
57
58 diff --git a/media-libs/zita-convolver/files/zita-convolver-3.1.0-makefile.patch b/media-libs/zita-convolver/files/zita-convolver-3.1.0-makefile.patch
59 deleted file mode 100644
60 index d8f5af24fcd..00000000000
61 --- a/media-libs/zita-convolver/files/zita-convolver-3.1.0-makefile.patch
62 +++ /dev/null
63 @@ -1,32 +0,0 @@
64 -Index: zita-convolver-3.1.0/libs/Makefile
65 -===================================================================
66 ---- zita-convolver-3.1.0.orig/libs/Makefile
67 -+++ zita-convolver-3.1.0/libs/Makefile
68 -@@ -32,8 +32,7 @@ VERSION = $(MAJVERS).$(MINVERS)
69 -
70 - CPPFLAGS += -I. -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DENABLE_VECTOR_MODE
71 - CXXFLAGS += -fPIC -Wall
72 --CXXFLAGS += -ffast-math -funroll-loops -O3
73 --CXXFLAGS += -march=native
74 -+CXXFLAGS += -ffast-math -funroll-loops
75 - LDLFAGS +=
76 - LDLIBS +=
77 -
78 -@@ -47,7 +46,7 @@ ZITA-CONVOLVER_H = zita-convolver.h
79 -
80 -
81 - $(ZITA-CONVOLVER_MIN): $(ZITA-CONVOLVER_O)
82 -- g++ -shared $(LDFLAGS) -Wl,-soname,$(ZITA-CONVOLVER_MAJ) -o $(ZITA-CONVOLVER_MIN) $(ZITA-CONVOLVER_O) $(ZITA-CONVOLVER_DEP)
83 -+ $(CXX) -shared $(LDFLAGS) -Wl,-soname,$(ZITA-CONVOLVER_MAJ) -o $(ZITA-CONVOLVER_MIN) $(ZITA-CONVOLVER_O) $(ZITA-CONVOLVER_DEP)
84 -
85 -
86 - install: $(ZITA-CONVOLVER_MIN)
87 -@@ -56,7 +55,7 @@ install: $(ZITA-CONVOLVER_MIN)
88 - install -m 644 $(ZITA-CONVOLVER_H) $(DESTDIR)$(PREFIX)/include
89 - install -m 755 $(ZITA-CONVOLVER_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)
90 - ln -sf $(ZITA-CONVOLVER_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(ZITA-CONVOLVER_SO)
91 -- ldconfig
92 -+ ln -sf $(ZITA-CONVOLVER_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(ZITA-CONVOLVER_MAJ)
93 -
94 - clean:
95 - /bin/rm -f *~ *.o *.a *.d *.so.*