Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC
Commits:
ae995d92 by Steve Lhomme at 2022-10-07T15:53:00+00:00
contrib: gsm: download the tarball to the name of the decompressed folder
No need to use a mv command for that. The package download command can download
from one filename and output to another.
Now we can use UNPACK_DIR
- - - - -
72a0b8b2 by Steve Lhomme at 2022-10-07T15:53:00+00:00
contrib: gsm: use the build install target
- - - - -
67d9d280 by Steve Lhomme at 2022-10-07T15:53:00+00:00
contrib: gsm: update to 1.0.22
And rework the patching build calls.
- - - - -
4 changed files:
- contrib/src/gsm/SHA512SUMS
- − contrib/src/gsm/gsm-cross.patch
- − contrib/src/gsm/gsm-missing-include.patch
- contrib/src/gsm/rules.mak
Changes:
=====================================
contrib/src/gsm/SHA512SUMS
=====================================
@@ -1 +1 @@
-0d0cf9e1e81e64cd84f588c1e4f0cb74b849d45e41fdebf860f63588084c73c7c5198bfe73a6c976bda5735ee516661d3db00afbb5cc5886a7ee3a7b31d673aa
libgsm_1.0.13.tar.gz
+f4284f096ed4d606ddece5c1b28edb63feacc26a0b664f1350c040dbf50113d27bedfd9896bf1620cb4fc3a6c8f6a5244955a6c625ded833dcee607c63c97dd2
gsm-1.0-pl22.tar.gz
=====================================
contrib/src/gsm/gsm-cross.patch deleted
=====================================
@@ -1,38 +0,0 @@
-diff -ruN gsm/Makefile gsm.new/Makefile
---- gsm/Makefile 2006-04-26 21:14:26.000000000 +0200
-+++ gsm.new/Makefile 2009-03-29 20:12:39.000000000 +0200
-@@ -43,10 +43,8 @@
- # CC = /usr/lang/acc
- # CCFLAGS = -c -O
-
--CC = gcc -ansi -pedantic
- CCFLAGS = -c -O2 -DNeedFunctionPrototypes=1
-
--LD = $(CC)
-
- # LD = gcc
- # LDFLAGS =
-@@ -98,14 +96,11 @@
- SHELL = /bin/sh
- LN = ln
- BASENAME = basename
--AR = ar
- ARFLAGS = cr
- RMFLAGS =
- FIND = find
- COMPRESS = compress
- COMPRESSFLAGS =
--# RANLIB = true
--RANLIB = ranlib
-
- #
- # You shouldn't have to configure below this line if you're porting.
-@@ -279,7 +274,7 @@
-
- # Target rules
-
--all: $(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST)
-+all: $(LIBGSM)
- @-echo $(ROOT): Done.
-
- tst: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result
=====================================
contrib/src/gsm/gsm-missing-include.patch deleted
=====================================
@@ -1,11 +0,0 @@
-diff -ru gsm-broken/src/code.c gsm/src/code.c
---- gsm-broken/src/code.c 2006-04-26 21:16:50.000000000 +0200
-+++ gsm/src/code.c 2016-04-05 17:13:19.000000000 +0200
-@@ -19,6 +19,7 @@
- #include "private.h"
- #include "gsm.h"
- #include "proto.h"
-+#include <string.h>
-
- /*
- * 4.2 FIXED POINT IMPLEMENTATION OF THE RPE-LTP CODER
=====================================
contrib/src/gsm/rules.mak
=====================================
@@ -1,23 +1,35 @@
# GSM
-GSM_VERSION := 1.0.13
-GSM_URL := http://www.quut.com/gsm/gsm-$(GSM_VERSION).tar.gz
+GSM_MAJVERSION := 1.0
+GSM_MINVERSION := 22
+GSM_URL :=
http://www.quut.com/gsm/gsm-$(GSM_MAJVERSION).$(GSM_MINVERSION).tar.gz
-$(TARBALLS)/libgsm_$(GSM_VERSION).tar.gz:
+$(TARBALLS)/gsm-$(GSM_MAJVERSION)-pl$(GSM_MINVERSION).tar.gz:
$(call download_pkg,$(GSM_URL),gsm)
-.sum-gsm: libgsm_$(GSM_VERSION).tar.gz
+.sum-gsm: gsm-$(GSM_MAJVERSION)-pl$(GSM_MINVERSION).tar.gz
-gsm: libgsm_$(GSM_VERSION).tar.gz .sum-gsm
+gsm: gsm-$(GSM_MAJVERSION)-pl$(GSM_MINVERSION).tar.gz .sum-gsm
$(UNPACK)
- mv gsm-1.0-* libgsm_$(GSM_VERSION)
- $(APPLY) $(SRC)/gsm/gsm-cross.patch
- $(APPLY) $(SRC)/gsm/gsm-missing-include.patch
- sed -e 's/^CFLAGS.*=/CFLAGS+=/' -i.orig libgsm_$(GSM_VERSION)/Makefile
+ # allow overriding hardcoded compiler variables
+ sed -i.orig 's,^CC ,#CC,' "$(UNPACK_DIR)/Makefile"
+ sed -i.orig 's,^LD ,#LD,' "$(UNPACK_DIR)/Makefile"
+ sed -i.orig 's,^AR ,#AR,' "$(UNPACK_DIR)/Makefile"
+ sed -i.orig 's,^RANLIB ,#RANLIB,' "$(UNPACK_DIR)/Makefile"
+ # allow overriding hardcoded install variables
+ sed -i.orig 's,GSM_INSTALL_ROOT =,GSM_INSTALL_ROOT ?=,'
"$(UNPACK_DIR)/Makefile"
+ sed -i.orig 's,GSM_INSTALL_INC =,GSM_INSTALL_INC ?=,'
"$(UNPACK_DIR)/Makefile"
+ sed -i.orig 's,GSM_INSTALL_MAN =,GSM_INSTALL_MAN ?=,'
"$(UNPACK_DIR)/Makefile"
+ # use the default make rules (use CPPFLAGS)
+ sed -i.orig 's,^.c.o:,#.c.o:,' "$(UNPACK_DIR)/Makefile"
+ sed -i.orig 's,^ $$(CC),# $$(CC),'
"$(UNPACK_DIR)/Makefile"
+ sed -i.orig 's,^ @-mv,# @-mv,'
"$(UNPACK_DIR)/Makefile"
$(MOVE)
+GSM_ENV := GSM_INSTALL_ROOT="$(PREFIX)" \
+ GSM_INSTALL_INC="$(PREFIX)/include/gsm" \
+ GSM_INSTALL_MAN="$(PREFIX)/share/man/man3"
+
.gsm: gsm
- $(HOSTVARS_PIC) $(MAKE) -C $<
- mkdir -p "$(PREFIX)/include/gsm" "$(PREFIX)/lib"
- cp $</inc/gsm.h "$(PREFIX)/include/gsm/"
- cp $</lib/libgsm.a "$(PREFIX)/lib/"
+ install -d "$(PREFIX)/lib" "$(PREFIX)/include/gsm"
"$(PREFIX)/share/man/man3"
+ $(HOSTVARS_PIC) $(GSM_ENV) $(MAKE) -C $< gsminstall
touch $@
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/d5ad888a6b5c65731156fe82646e9d5a3af56aa8...67d9d280f7bf8bb678b8036c27f04e8793a80128
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/d5ad888a6b5c65731156fe82646e9d5a3af56aa8...67d9d280f7bf8bb678b8036c27f04e8793a80128
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits
