FreeBSD Bugzilla – Attachment 126926 Details for
Bug 170714
update for audio/freeswitch-sounds
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 11.92 KB, created by
RIchard Neese
on 2012-08-17 22:10:07 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
RIchard Neese
Created:
2012-08-17 22:10:07 UTC
Size:
11.92 KB
patch
obsolete
>Index: distinfo >=================================================================== >--- distinfo (revision 302692) >+++ distinfo (working copy) >@@ -1,24 +1,24 @@ >-SHA256 (freeswitch-sounds/freeswitch-sounds-en-us-callie-8000-1.0.18.tar.gz) = 131b87a4c190d40ce3c5a67c2d2096158f11e85a1659eeb2bbf38e08bf7be812 >-SIZE (freeswitch-sounds/freeswitch-sounds-en-us-callie-8000-1.0.18.tar.gz) = 14180974 >-SHA256 (freeswitch-sounds/freeswitch-sounds-en-us-callie-16000-1.0.18.tar.gz) = c1c6d4405055db31eeb47d3a90ffaf9fb5ca5eecc962749f1409780223fd761a >-SIZE (freeswitch-sounds/freeswitch-sounds-en-us-callie-16000-1.0.18.tar.gz) = 28161362 >-SHA256 (freeswitch-sounds/freeswitch-sounds-en-us-callie-32000-1.0.18.tar.gz) = cbd55b6355829bb559741700d2a310718a95800f8cf8b229e1d15eb99b94d3a4 >-SIZE (freeswitch-sounds/freeswitch-sounds-en-us-callie-32000-1.0.18.tar.gz) = 55081458 >-SHA256 (freeswitch-sounds/freeswitch-sounds-en-us-callie-48000-1.0.18.tar.gz) = a060fc118090b679408f8e712af9e556816e0d7f4c59422f7504066c693d71e9 >-SIZE (freeswitch-sounds/freeswitch-sounds-en-us-callie-48000-1.0.18.tar.gz) = 80491982 >-SHA256 (freeswitch-sounds/freeswitch-sounds-fr-ca-june-8000-1.0.14.tar.gz) = 2a10fdae75cdd6cbb12c5e99a854b01433221ebe99c49d6db024164fdc72d252 >-SIZE (freeswitch-sounds/freeswitch-sounds-fr-ca-june-8000-1.0.14.tar.gz) = 9203881 >-SHA256 (freeswitch-sounds/freeswitch-sounds-fr-ca-june-16000-1.0.14.tar.gz) = 0dc4351534547994daf7b3bfdbb8df9b4bf75e8e4f576819468e6c708578b0a2 >-SIZE (freeswitch-sounds/freeswitch-sounds-fr-ca-june-16000-1.0.14.tar.gz) = 18198669 >-SHA256 (freeswitch-sounds/freeswitch-sounds-fr-ca-june-32000-1.0.14.tar.gz) = efb3842a638dcfa9376f602b80ef00416bfa4fc5922f05aea772009690a6792f >-SIZE (freeswitch-sounds/freeswitch-sounds-fr-ca-june-32000-1.0.14.tar.gz) = 35601264 >-SHA256 (freeswitch-sounds/freeswitch-sounds-fr-ca-june-48000-1.0.14.tar.gz) = a53f53604b38e5313637cb057f3f61e48bea335b312ad822165dde9bc8cfc6ff >-SIZE (freeswitch-sounds/freeswitch-sounds-fr-ca-june-48000-1.0.14.tar.gz) = 52402291 >-SHA256 (freeswitch-sounds/freeswitch-sounds-ru-RU-elena-8000-1.0.12.tar.gz) = 44db35574216af8ccbb48a7f1a08065df253adb4cebed8bc7ece7d0a4da920e7 >-SIZE (freeswitch-sounds/freeswitch-sounds-ru-RU-elena-8000-1.0.12.tar.gz) = 9115259 >-SHA256 (freeswitch-sounds/freeswitch-sounds-ru-RU-elena-16000-1.0.12.tar.gz) = aef0d3dc7fed657bc9c9d5ebbb458bc28e55c62af0087623ad060f1b4de3c74c >-SIZE (freeswitch-sounds/freeswitch-sounds-ru-RU-elena-16000-1.0.12.tar.gz) = 17952582 >-SHA256 (freeswitch-sounds/freeswitch-sounds-ru-RU-elena-32000-1.0.12.tar.gz) = 3be071456c03d8eac191f1a417ffcc48eb7100633cbb8d8cc62fde1c328ede08 >-SIZE (freeswitch-sounds/freeswitch-sounds-ru-RU-elena-32000-1.0.12.tar.gz) = 35345749 >-SHA256 (freeswitch-sounds/freeswitch-sounds-ru-RU-elena-48000-1.0.12.tar.gz) = 12e164bbc99729a87d9a57bff557b6a190b5349b30cad71dcae458d92288aa3b >-SIZE (freeswitch-sounds/freeswitch-sounds-ru-RU-elena-48000-1.0.12.tar.gz) = 51864057 >+SHA256 (freeswitch/freeswitch-sounds-en-us-callie-8000-1.0.20.tar.gz) = 663b72ebf4f2b99202daf9783aafa3e056a67c1ec803f2b2f1d1e71207e3b2ec >+SIZE (freeswitch/freeswitch-sounds-en-us-callie-8000-1.0.20.tar.gz) = 15643920 >+SHA256 (freeswitch/freeswitch-sounds-en-us-callie-16000-1.0.20.tar.gz) = af788e98a8a638366a2dc7510aa56a4a82507b606f63f982b288ebad7e571a0c >+SIZE (freeswitch/freeswitch-sounds-en-us-callie-16000-1.0.20.tar.gz) = 31160818 >+SHA256 (freeswitch/freeswitch-sounds-en-us-callie-32000-1.0.20.tar.gz) = 66a192dcf5ebf2b57c5c01ee9e8e2a04d8c50614ce7000698984d5ca8252735c >+SIZE (freeswitch/freeswitch-sounds-en-us-callie-32000-1.0.20.tar.gz) = 61199871 >+SHA256 (freeswitch/freeswitch-sounds-en-us-callie-48000-1.0.20.tar.gz) = 4f5522ccac0167cd6b0de79e1f386a57ba57c3a157910901b0dc28989624678c >+SIZE (freeswitch/freeswitch-sounds-en-us-callie-48000-1.0.20.tar.gz) = 87945358 >+SHA256 (freeswitch/freeswitch-sounds-fr-ca-june-8000-1.0.16.tar.gz) = 65f6a1bd385c6075e4203a637ecb85bbf97ec3b3ebe308cb2228920dc7b218d1 >+SIZE (freeswitch/freeswitch-sounds-fr-ca-june-8000-1.0.16.tar.gz) = 11132039 >+SHA256 (freeswitch/freeswitch-sounds-fr-ca-june-16000-1.0.16.tar.gz) = 4e00722c5487c25f403e432c21a7be72eded0347496490167b82494edc6b4682 >+SIZE (freeswitch/freeswitch-sounds-fr-ca-june-16000-1.0.16.tar.gz) = 22007198 >+SHA256 (freeswitch/freeswitch-sounds-fr-ca-june-32000-1.0.16.tar.gz) = c5d986db76369062671bdd1c7adfbd26613ea42ec14f2ace3f007b54a18e4f7a >+SIZE (freeswitch/freeswitch-sounds-fr-ca-june-32000-1.0.16.tar.gz) = 43083229 >+SHA256 (freeswitch/freeswitch-sounds-fr-ca-june-48000-1.0.16.tar.gz) = 5b689c85e08bc83d3c40c1829d250580e92c673587b14b7e20768efcd1afe55f >+SIZE (freeswitch/freeswitch-sounds-fr-ca-june-48000-1.0.16.tar.gz) = 63475346 >+SHA256 (freeswitch/freeswitch-sounds-ru-RU-elena-8000-1.0.13.tar.gz) = a04f0d33462a782c9fe8e81331a7c0928950c3fcc83f90cdf774974114bf1e53 >+SIZE (freeswitch/freeswitch-sounds-ru-RU-elena-8000-1.0.13.tar.gz) = 14363334 >+SHA256 (freeswitch/freeswitch-sounds-ru-RU-elena-16000-1.0.13.tar.gz) = f68bf958625d7fec95ffdec374b197bdddceff372e43c01d6502f39a362a0e15 >+SIZE (freeswitch/freeswitch-sounds-ru-RU-elena-16000-1.0.13.tar.gz) = 28650196 >+SHA256 (freeswitch/freeswitch-sounds-ru-RU-elena-32000-1.0.13.tar.gz) = 621fbe1d6d4c7bafc407aac9898676fe2807a74e5f907a27870095804f6f5652 >+SIZE (freeswitch/freeswitch-sounds-ru-RU-elena-32000-1.0.13.tar.gz) = 56843560 >+SHA256 (freeswitch/freeswitch-sounds-ru-RU-elena-48000-1.0.13.tar.gz) = f2db5f456e94e10f262ee08407484e4faf538a28e38c67867a8598636cca0d4a >+SIZE (freeswitch/freeswitch-sounds-ru-RU-elena-48000-1.0.13.tar.gz) = 84394475 >Index: Makefile >=================================================================== >--- Makefile (revision 302692) >+++ Makefile (working copy) >@@ -6,12 +6,11 @@ > # > > PORTNAME= freeswitch >-DISTVERSION= 1.0.18 >-PORTREVISION= 1 >+DISTVERSION= 1.0.20 > CATEGORIES= audio > MASTER_SITES= http://files.freeswitch.org/ > PKGNAMESUFFIX= -sounds >-DIST_SUBDIR= freeswitch-sounds >+DIST_SUBDIR= ${PORTNAME}${PORTNAMESUFFIX} > > MAINTAINER= r.neese@gmail.com > COMMENT= FreeSwitch Sounds (All Bitrates) >@@ -24,36 +23,47 @@ > GROUPS= ${USERS} > LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX} > >-OPTIONS= DOWNLOAD "Don't resample, download all." off \ >- 8K "Compile sounds for 8K" on \ >- 16K "Compile sounds for 16K" on \ >- 32K "Compile sounds for 32K" on \ >- 48K "Compile sounds for 48K" on \ >- ENGLISH "Compile US English Language Sounds" on \ >- FRENCH "Compile French Canadian Language Sounds" off \ >- RUSSIAN "Compile Russian Language Sounds" off >- >+DOWNLOAD_DESC= Download Sounds >+8K_DESC= 8000Hz Audio Files >+16K_DESC= 16000Hz Audio Files >+32K_DESC= 32000Hz Audio Files >+48K_DESC= 48000Hz Audio Files >+ENGLISH_DESC= Compile US English Language Sounds >+FRENCH_DESC= Compile French Canadian Language Sounds >+RUSSIAN_DESC= Compile Russian Language Sounds >+ >+OPTIONS_DEFINE= DOWNLOAD >+ >+OPTIONS_SINGLE= LANG >+OPTIONS_SINGLE_LANG= ENGLISH FRENCH RUSSIAN >+ >+OPTIONS_MULTI= AUDIO >+OPTIONS_MULTI_AUDIO= 8K 16K 32K 48K >+ >+OPTIONS_DEFAULT= 8K 16K ENGLISH >+NO_OPTIONS_SORT= yes >+ > .include <bsd.port.options.mk> > >-.if ! defined(WITH_DOWNLOAD) >+.if empty(PORT_OPTIONS:MDOWNLOAD) > BUILD_DEPENDS+= sox:${PORTSDIR}/audio/sox > .endif > >-.if defined(WITH_8K) >+.if ${PORT_OPTIONS:M8K} > BITRATES+= 8000 > .endif >-.if defined(WITH_16K) >+.if ${PORT_OPTIONS:M16K} > BITRATES+= 16000 > .endif >-.if defined(WITH_32K) >+.if ${PORT_OPTIONS:M32K} > BITRATES+= 32000 > .endif >-.if defined(WITH_48K) >+.if ${PORT_OPTIONS:M48K} > BITRATES+= 48000 > .endif > >-.if defined(WITH_ENGLISH) >-.if defined(WITH_DOWNLOAD) >+.if ${PORT_OPTIONS:MENGLISH} >+.if ${PORT_OPTIONS:MDOWNLOAD} > .for rate in ${BITRATES} > DISTFILES+= ${PORTNAME}${PKGNAMESUFFIX}-en-us-callie-${rate}-${DISTVERSION}${EXTRACT_SUFX} > .endfor >@@ -61,45 +71,44 @@ > DISTFILES+= ${PORTNAME}${PKGNAMESUFFIX}-en-us-callie-48000-${DISTVERSION}${EXTRACT_SUFX} > .endif > .endif >-.if defined(WITH_FRENCH) >-.if defined(WITH_DOWNLOAD) >+.if ${PORT_OPTIONS:MFRENCH} >+.if ${PORT_OPTIONS:MDOWNLOAD} > .for rate in ${BITRATES} >-DISTFILES+= ${PORTNAME}${PKGNAMESUFFIX}-fr-ca-june-${rate}-1.0.14${EXTRACT_SUFX} >+DISTFILES+= ${PORTNAME}${PKGNAMESUFFIX}-fr-ca-june-${rate}-1.0.16${EXTRACT_SUFX} > .endfor > .else >-DISTFILES+= ${PORTNAME}${PKGNAMESUFFIX}-fr-ca-june-48000-1.0.14${EXTRACT_SUFX} >+DISTFILES+= ${PORTNAME}${PKGNAMESUFFIX}-fr-ca-june-48000-1.0.16${EXTRACT_SUFX} > .endif > .endif >-.if defined(WITH_RUSSIAN) >-.if defined(WITH_DOWNLOAD) >+.if ${PORT_OPTIONS:MRUSSIAN} >+.if ${PORT_OPTIONS:MDOWNLOAD} > .for rate in ${BITRATES} >-DISTFILES+= ${PORTNAME}${PKGNAMESUFFIX}-ru-RU-elena-${rate}-1.0.12${EXTRACT_SUFX} >+DISTFILES+= ${PORTNAME}${PKGNAMESUFFIX}-ru-RU-elena-${rate}-1.0.13${EXTRACT_SUFX} > .endfor > .else >-DISTFILES+= ${PORTNAME}${PKGNAMESUFFIX}-ru-RU-elena-48000-1.0.12${EXTRACT_SUFX} >+DISTFILES+= ${PORTNAME}${PKGNAMESUFFIX}-ru-RU-elena-48000-1.0.13${EXTRACT_SUFX} > .endif > .endif > >-.if ! defined(WITH_ENGLISH) && ! defined(WITH_FRENCH) && ! defined(WITH_RUSSIAN) >-BROKEN= you must build with atleast English or French or Russian, >-.endif >- >-.if ! defined(WITH_8K) && ! defined(WITH_16K) && ! defined(WITH_32K) && \ >- ! defined(WITH_48K) >-BROKEN= you must build with at least one of 8K, 16K, 32K, or 48K sounds >-.endif >- > .if defined(FREESWITCH_VSCALE) > SCALE=${FREESWITCH_VSCALE} > .else > SCALE=0.2 > .endif > >+.for opt in ${ALL_OPTIONS} >+.if $(PORT_OPTIONS:M${opt}) >+PLIST_SUB+= ${opt}="" >+.else >+PLIST_SUB+= ${opt}="@comment " >+.endif >+.endfor >+ > do-build: > @${ECHO_MSG} "===> Building for bitrates: ${BITRATES}" >- @${ECHO_MSG} "===> Download >>>${WITH_DOWNLOAD}<<<" >+ @${ECHO_MSG} "===> Download >>>${PORT_OPTIONS:MDOWNLOAD}<<<" > @${ECHO_MSG} "===> Scaling audio to ${SCALE}" >- if [ "${WITH_ENGLISH}" != "" -a ! -e "${WRKDIR}/ENGLISH.done" ]; then \ >+ if [ -n "${PORT_OPTIONS:MENGLISH}" -a ! -e "${WRKDIR}/ENGLISH.done" ]; then \ > ${ECHO_MSG} "====> English selected."; \ > for rate in ${BITRATES}; do \ > ${ECHO_MSG} "WORKING on $${rate}!"; \ >@@ -108,7 +117,7 @@ > for filename in `ls ${WRKSRC}/en/us/callie/$${dir}/48000`; do \ > echo "${DATADIR_REL}/sounds/en/us/callie/$${dir}/$${rate}/$${filename}" >> ${PLIST}; \ > if [ ! -e "${WRKDIR}/tmp/en/us/callie/$${dir}/$${rate}/$${filename}" ]; then \ >- if [ "${WITH_DOWNLOAD}" = "true" ]; then \ >+ if [ "${PORT_OPTIONS:MDOWNLOAD}" = "true" ]; then \ > ${ECHO} -n "."; \ > ${MV} ${WRKSRC}/en/us/callie/$${dir}/$${rate}/$${filename} ${WRKDIR}/tmp/en/us/callie/$${dir}/$${rate}/$${filename} ; \ > else \ >@@ -124,7 +133,7 @@ > ${TOUCH} ${WRKDIR}/ENGLISH.done; \ > fi > >- if [ "${WITH_FRENCH}" != "" -a ! -e "${WRKDIR}/FRENCH.done" ]; then \ >+ if [ -n "${PORT_OPTIONS:MFRENCH}" -a ! -e "${WRKDIR}/FRENCH.done" ]; then \ > ${ECHO_MSG} "====> French selected."; \ > for rate in ${BITRATES}; do \ > ${ECHO_MSG} "WORKING on $${rate}!"; \ >@@ -133,7 +142,7 @@ > for filename in `ls ${WRKSRC}/fr/ca/june/$${dir}/48000`; do \ > echo "${DATADIR_REL}/sounds/fr/ca/june/$${dir}/$${rate}/$${filename}" >> ${PLIST}; \ > if [ ! -e "${WRKDIR}/tmp/fr/ca/june/$${dir}/$${rate}/$${filename}" ]; then \ >- if [ "${WITH_DOWNLOAD}" = "true" ]; then \ >+ if [ "${PORT_OPTIONS:MDOWNLOAD}" = "true" ]; then \ > ${ECHO} -n "."; \ > ${MV} ${WRKSRC}/fr/ca/june/$${dir}/$${rate}/$${filename} ${WRKDIR}/tmp/fr/ca/june/$${dir}/$${rate}/$${filename} ; \ > else \ >@@ -149,7 +158,7 @@ > ${TOUCH} ${WRKDIR}/FRENCH.done; \ > fi > >- if [ "${WITH_RUSSIAN}" != "" -a ! -e "${WRKDIR}/RUSSIAN.done" ]; then \ >+ if [ -n "${PORT_OPTIONS:MRUSSIAN}" -a ! -e "${WRKDIR}/RUSSIAN.done" ]; then \ > ${ECHO_MSG} "====> Russian selected."; \ > for rate in ${BITRATES}; do \ > ${ECHO_MSG} "WORKING on $${rate}!"; \ >@@ -158,7 +167,7 @@ > for filename in `ls ${WRKSRC}/ru/RU/elena/$${dir}/48000`; do \ > echo "share/${DATADIR_REL}/sounds/ru/RU/elena/$${dir}/$${rate}/$${filename}" >> ${PLIST}; \ > if [ ! -e "${WRKDIR}/tmp/ru/RU/elena/$${dir}/$${rate}/$${filename}" ]; then \ >- if [ "${WITH_DOWNLOAD}" = "true" ]; then \ >+ if [ "${PORT_OPTIONS:MDOWNLOAD}" = "true" ]; then \ > ${ECHO} -n "."; \ > ${MV} ${WRKSRC}/ru/RU/elena/$${dir}/$${rate}/$${filename} ${WRKDIR}/tmp/ru/RU/elena/$${dir}/$${rate}/$${filename}; \ > else \
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 170714
: 126926