Skip to content

Commit bd7fe0f

Browse files
AndWacAndWac
authored
speex: update to 1.2.1
1 parent aaa85db commit bd7fe0f

4 files changed

Lines changed: 30 additions & 34 deletions

File tree

‎components/multimedia/speex/Makefile‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,37 +12,27 @@
1212
#
1313
# Copyright 2015 Alexander Pyhalov
1414
#
15-
15+
BUILD_BITS= 64_and_32
1616
include ../../../make-rules/shared-macros.mk
1717

1818
COMPONENT_NAME= speex
19-
COMPONENT_VERSION= 1.2rc2
20-
IPS_COMPONENT_VERSION= 1.2.0.2
19+
COMPONENT_VERSION= 1.2.1
2120
COMPONENT_SUMMARY= Open Source speech codec
2221
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
2322
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
24-
COMPONENT_ARCHIVE_HASH= \
25-
sha256:caa27c7247ff15c8521c2ae0ea21987c9e9710a8f2d3448e8b79da9806bce891
26-
COMPONENT_ARCHIVE_URL= \
27-
http://downloads.xiph.org/releases/speex/$(COMPONENT_ARCHIVE)
28-
COMPONENT_PROJECT_URL = http://www.speex.org/
23+
COMPONENT_ARCHIVE_HASH= sha256:4b44d4f2b38a370a2d98a78329fefc56a0cf93d1c1be70029217baae6628feea
24+
COMPONENT_ARCHIVE_URL= http://downloads.xiph.org/releases/speex/$(COMPONENT_ARCHIVE)
25+
COMPONENT_PROJECT_URL= https://www.speex.org/
2926
COMPONENT_FMRI= codec/speex
3027
COMPONENT_CLASSIFICATION= System/Multimedia Libraries
3128
COMPONENT_LICENSE = BSD
3229
COMPONENT_LICENSE_FILE = COPYING
3330

34-
include $(WS_MAKE_RULES)/prep.mk
35-
include $(WS_MAKE_RULES)/configure.mk
36-
include $(WS_MAKE_RULES)/ips.mk
31+
TEST_TARGET= $(NO_TESTS)
32+
include $(WS_MAKE_RULES)/common.mk
3733

3834
PATH=$(PATH.gnu)
3935

40-
build: $(BUILD_32_and_64)
41-
42-
install: $(INSTALL_32_and_64)
43-
44-
test: $(NO_TESTS)
45-
4636
# Auto-generated dependencies
4737
REQUIRED_PACKAGES += library/libogg
4838
REQUIRED_PACKAGES += library/speexdsp

‎components/multimedia/speex/manifests/sample-manifest.p5m‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@
1010
#
1111

1212
#
13-
# Copyright 2016 <contributor>
13+
# Copyright 2022 <contributor>
1414
#
1515

1616
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
17+
set name=pkg.human-version value=$(HUMAN_VERSION)
1718
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
1819
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
1920
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
@@ -22,8 +23,8 @@ set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
2223

2324
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
2425

25-
file path=usr/bin/$(MACH64)/speexdec
26-
file path=usr/bin/$(MACH64)/speexenc
26+
file path=usr/bin/$(MACH32)/speexdec
27+
file path=usr/bin/$(MACH32)/speexenc
2728
file path=usr/bin/speexdec
2829
file path=usr/bin/speexenc
2930
file path=usr/include/speex/speex.h
@@ -34,14 +35,14 @@ file path=usr/include/speex/speex_header.h
3435
file path=usr/include/speex/speex_stereo.h
3536
file path=usr/include/speex/speex_types.h
3637
file path=usr/lib/$(MACH64)/libspeex.a
37-
link path=usr/lib/$(MACH64)/libspeex.so target=libspeex.so.1.5.0
38-
link path=usr/lib/$(MACH64)/libspeex.so.1 target=libspeex.so.1.5.0
39-
file path=usr/lib/$(MACH64)/libspeex.so.1.5.0
38+
link path=usr/lib/$(MACH64)/libspeex.so target=libspeex.so.1.5.2
39+
link path=usr/lib/$(MACH64)/libspeex.so.1 target=libspeex.so.1.5.2
40+
file path=usr/lib/$(MACH64)/libspeex.so.1.5.2
4041
file path=usr/lib/$(MACH64)/pkgconfig/speex.pc
4142
file path=usr/lib/libspeex.a
42-
link path=usr/lib/libspeex.so target=libspeex.so.1.5.0
43-
link path=usr/lib/libspeex.so.1 target=libspeex.so.1.5.0
44-
file path=usr/lib/libspeex.so.1.5.0
43+
link path=usr/lib/libspeex.so target=libspeex.so.1.5.2
44+
link path=usr/lib/libspeex.so.1 target=libspeex.so.1.5.2
45+
file path=usr/lib/libspeex.so.1.5.2
4546
file path=usr/lib/pkgconfig/speex.pc
4647
file path=usr/share/aclocal/speex.m4
4748
file path=usr/share/doc/speex/manual.pdf

‎components/multimedia/speex/pkg5‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"SUNWcs",
44
"library/libogg",
55
"library/speexdsp",
6+
"shell/ksh93",
67
"system/library",
78
"system/library/math"
89
],

‎components/multimedia/speex/speex.p5m‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#
1515

1616
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
17+
set name=pkg.human-version value=$(HUMAN_VERSION)
1718
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
1819
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
1920
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
@@ -22,8 +23,11 @@ set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
2223

2324
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
2425

25-
file path=usr/bin/$(MACH64)/speexdec
26-
file path=usr/bin/$(MACH64)/speexenc
26+
#Drop 32 bit apps:
27+
<transform path=usr/bin/$(MACH32) -> drop>
28+
29+
file path=usr/bin/$(MACH32)/speexdec
30+
file path=usr/bin/$(MACH32)/speexenc
2731
file path=usr/bin/speexdec
2832
file path=usr/bin/speexenc
2933
file path=usr/include/speex/speex.h
@@ -33,13 +37,13 @@ file path=usr/include/speex/speex_config_types.h
3337
file path=usr/include/speex/speex_header.h
3438
file path=usr/include/speex/speex_stereo.h
3539
file path=usr/include/speex/speex_types.h
36-
link path=usr/lib/$(MACH64)/libspeex.so target=libspeex.so.1.5.0
37-
link path=usr/lib/$(MACH64)/libspeex.so.1 target=libspeex.so.1.5.0
38-
file path=usr/lib/$(MACH64)/libspeex.so.1.5.0
40+
link path=usr/lib/$(MACH64)/libspeex.so target=libspeex.so.1.5.2
41+
link path=usr/lib/$(MACH64)/libspeex.so.1 target=libspeex.so.1.5.2
42+
file path=usr/lib/$(MACH64)/libspeex.so.1.5.2
3943
file path=usr/lib/$(MACH64)/pkgconfig/speex.pc
40-
link path=usr/lib/libspeex.so target=libspeex.so.1.5.0
41-
link path=usr/lib/libspeex.so.1 target=libspeex.so.1.5.0
42-
file path=usr/lib/libspeex.so.1.5.0
44+
link path=usr/lib/libspeex.so target=libspeex.so.1.5.2
45+
link path=usr/lib/libspeex.so.1 target=libspeex.so.1.5.2
46+
file path=usr/lib/libspeex.so.1.5.2
4347
file path=usr/lib/pkgconfig/speex.pc
4448
file path=usr/share/aclocal/speex.m4
4549
file path=usr/share/doc/speex/manual.pdf

0 commit comments

Comments
 (0)