| 1 |
aballier 09/07/03 19:27:05 |
| 2 |
|
| 3 |
Added: opencore-amr-0.1.1-libdir.patch |
| 4 |
opencore-amr-0.1.1-pic.patch |
| 5 |
Log: |
| 6 |
initial import, ebuild by me |
| 7 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-libs/opencore-amr/files/opencore-amr-0.1.1-libdir.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/opencore-amr/files/opencore-amr-0.1.1-libdir.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/opencore-amr/files/opencore-amr-0.1.1-libdir.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: opencore-amr-0.1.1-libdir.patch |
| 16 |
=================================================================== |
| 17 |
Index: opencore-amr/amrnb/Makefile |
| 18 |
=================================================================== |
| 19 |
--- opencore-amr.orig/amrnb/Makefile |
| 20 |
+++ opencore-amr/amrnb/Makefile |
| 21 |
@@ -2,6 +2,7 @@ |
| 22 |
# a detached gsm_amr directory |
| 23 |
OC_BASE = ../opencore |
| 24 |
AMR_BASE = $(OC_BASE)/codecs_v2/audio/gsm_amr |
| 25 |
+LIBDIR=lib |
| 26 |
|
| 27 |
# To compile as C instead of C++, define BUILD_AS_C |
| 28 |
ifneq (, $(BUILD_AS_C)) |
| 29 |
@@ -77,12 +78,12 @@ libopencore-amrnb.a: $(OBJS) |
| 30 |
ar rcs $@ $+ |
| 31 |
|
| 32 |
install: libopencore-amrnb.a $(SHLIB) |
| 33 |
- install -d $(DESTDIR)$(PREFIX)/lib |
| 34 |
- install -m 644 libopencore-amrnb.a $(DESTDIR)$(PREFIX)/lib |
| 35 |
- install $(SHLIB) $(DESTDIR)$(PREFIX)/lib |
| 36 |
+ install -d $(DESTDIR)$(PREFIX)/$(LIBDIR) |
| 37 |
+ install -m 644 libopencore-amrnb.a $(DESTDIR)$(PREFIX)/$(LIBDIR) |
| 38 |
+ install $(SHLIB) $(DESTDIR)$(PREFIX)/$(LIBDIR) |
| 39 |
ifneq ($(shell uname), Darwin) |
| 40 |
- ln -sf $(SHLIB) $(DESTDIR)$(PREFIX)/lib/$(SONAME) |
| 41 |
- ln -sf $(SONAME) $(DESTDIR)$(PREFIX)/lib/libopencore-amrnb.so |
| 42 |
+ ln -sf $(SHLIB) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(SONAME) |
| 43 |
+ ln -sf $(SONAME) $(DESTDIR)$(PREFIX)/$(LIBDIR)/libopencore-amrnb.so |
| 44 |
endif |
| 45 |
install -d $(DESTDIR)$(PREFIX)/include/opencore-amrnb |
| 46 |
install -m 644 interf_dec.h $(DESTDIR)$(PREFIX)/include/opencore-amrnb |
| 47 |
Index: opencore-amr/amrwb/Makefile |
| 48 |
=================================================================== |
| 49 |
--- opencore-amr.orig/amrwb/Makefile |
| 50 |
+++ opencore-amr/amrwb/Makefile |
| 51 |
@@ -2,6 +2,7 @@ |
| 52 |
# a detached gsm_amr directory |
| 53 |
OC_BASE = ../opencore |
| 54 |
AMR_BASE = $(OC_BASE)/codecs_v2/audio/gsm_amr |
| 55 |
+LIBDIR=lib |
| 56 |
|
| 57 |
# To compile as C instead of C++, define BUILD_AS_C |
| 58 |
ifneq (, $(BUILD_AS_C)) |
| 59 |
@@ -63,12 +64,12 @@ libopencore-amrwb.a: $(OBJS) |
| 60 |
ar rcs $@ $+ |
| 61 |
|
| 62 |
install: libopencore-amrwb.a $(SHLIB) |
| 63 |
- install -d $(DESTDIR)$(PREFIX)/lib |
| 64 |
- install -m 644 libopencore-amrwb.a $(DESTDIR)$(PREFIX)/lib |
| 65 |
- install $(SHLIB) $(DESTDIR)$(PREFIX)/lib |
| 66 |
+ install -d $(DESTDIR)$(PREFIX)/$(LIBDIR) |
| 67 |
+ install -m 644 libopencore-amrwb.a $(DESTDIR)$(PREFIX)/$(LIBDIR) |
| 68 |
+ install $(SHLIB) $(DESTDIR)$(PREFIX)/$(LIBDIR) |
| 69 |
ifneq ($(shell uname), Darwin) |
| 70 |
- ln -sf $(SHLIB) $(DESTDIR)$(PREFIX)/lib/$(SONAME) |
| 71 |
- ln -sf $(SONAME) $(DESTDIR)$(PREFIX)/lib/libopencore-amrwb.so |
| 72 |
+ ln -sf $(SHLIB) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(SONAME) |
| 73 |
+ ln -sf $(SONAME) $(DESTDIR)$(PREFIX)/$(LIBDIR)/libopencore-amrwb.so |
| 74 |
endif |
| 75 |
install -d $(DESTDIR)$(PREFIX)/include/opencore-amrwb |
| 76 |
install -m 644 dec_if.h $(DESTDIR)$(PREFIX)/include/opencore-amrwb |
| 77 |
|
| 78 |
|
| 79 |
|
| 80 |
1.1 media-libs/opencore-amr/files/opencore-amr-0.1.1-pic.patch |
| 81 |
|
| 82 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/opencore-amr/files/opencore-amr-0.1.1-pic.patch?rev=1.1&view=markup |
| 83 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/opencore-amr/files/opencore-amr-0.1.1-pic.patch?rev=1.1&content-type=text/plain |
| 84 |
|
| 85 |
Index: opencore-amr-0.1.1-pic.patch |
| 86 |
=================================================================== |
| 87 |
Index: opencore-amr/amrnb/Makefile |
| 88 |
=================================================================== |
| 89 |
--- opencore-amr.orig/amrnb/Makefile |
| 90 |
+++ opencore-amr/amrnb/Makefile |
| 91 |
@@ -41,6 +41,7 @@ COMMON_OBJS := $(COMMON_SRC:.cpp=.o) |
| 92 |
COMMON_OBJS := $(patsubst %,$(COMMON_SRC_DIR)/%, $(COMMON_OBJS)) |
| 93 |
|
| 94 |
OBJS = wrapper.o $(DEC_OBJS) $(ENC_OBJS) $(COMMON_OBJS) |
| 95 |
+SOBJS = $(OBJS:%.o=%.lo) |
| 96 |
|
| 97 |
#Versioning |
| 98 |
MAJOR = 0 |
| 99 |
@@ -59,13 +60,19 @@ SHLIB = libopencore-amrnb.$(SHLIB_EXT) |
| 100 |
|
| 101 |
all: libopencore-amrnb.a $(SHLIB) |
| 102 |
|
| 103 |
-$(SHLIB): $(OBJS) |
| 104 |
+$(SHLIB): $(SOBJS) |
| 105 |
ifeq ($(shell uname), Darwin) |
| 106 |
$(CXX) $(SHLIB_FLAGS) -o $@ $+ $(LDFLAGS) |
| 107 |
else |
| 108 |
$(CXX) $(SHLIB_FLAGS) -o $@ $+ -Wl,-soname,$(SONAME) $(LDFLAGS) |
| 109 |
endif |
| 110 |
|
| 111 |
+%.lo: %.c |
| 112 |
+ $(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -DPIC -c $< -o $@ |
| 113 |
+ |
| 114 |
+%.lo: %.cpp |
| 115 |
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -fPIC -DPIC -c $< -o $@ |
| 116 |
+ |
| 117 |
libopencore-amrnb.a: $(OBJS) |
| 118 |
ar rcs $@ $+ |
| 119 |
|
| 120 |
Index: opencore-amr/amrwb/Makefile |
| 121 |
=================================================================== |
| 122 |
--- opencore-amr.orig/amrwb/Makefile |
| 123 |
+++ opencore-amr/amrwb/Makefile |
| 124 |
@@ -27,6 +27,7 @@ DEC_OBJS := $(DEC_SRC:.cpp=.o) |
| 125 |
DEC_OBJS := $(patsubst %,$(DEC_SRC_DIR)/%, $(DEC_OBJS)) |
| 126 |
|
| 127 |
OBJS = wrapper.o $(DEC_OBJS) |
| 128 |
+SOBJS = $(OBJS:%.o=%.lo) |
| 129 |
|
| 130 |
#Versioning |
| 131 |
MAJOR = 0 |
| 132 |
@@ -45,13 +46,19 @@ SHLIB = libopencore-amrwb.$(SHLIB_EXT) |
| 133 |
|
| 134 |
all: libopencore-amrwb.a $(SHLIB) |
| 135 |
|
| 136 |
-$(SHLIB): $(OBJS) |
| 137 |
+$(SHLIB): $(SOBJS) |
| 138 |
ifeq ($(shell uname), Darwin) |
| 139 |
$(CXX) $(SHLIB_FLAGS) -o $@ $+ $(LDFLAGS) |
| 140 |
else |
| 141 |
$(CXX) $(SHLIB_FLAGS) -o $@ $+ -Wl,-soname,$(SONAME) $(LDFLAGS) |
| 142 |
endif |
| 143 |
|
| 144 |
+%.lo: %.c |
| 145 |
+ $(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -DPIC -c $< -o $@ |
| 146 |
+ |
| 147 |
+%.lo: %.cpp |
| 148 |
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -fPIC -DPIC -c $< -o $@ |
| 149 |
+ |
| 150 |
libopencore-amrwb.a: $(OBJS) |
| 151 |
ar rcs $@ $+ |
Archives