Re: UPDATE: libsamplerate

2024-05-03 Thread Jan Stary
On May 03 20:03:43, h...@stare.cz wrote:
> > > > > > > On Apr 26 20:46:51, b...@comstyle.com wrote:
> > > > > > > > Implement SSE2 lrint() and lrintf() on amd64.
> > > > > > > 
> > > > > > > I don't think this is worth the added complexity:
> > > > > > > seven more patches to have a different lrint()?
> > > > > > > Does it make the resampling noticably better/faster?

BTW, this is what libm/arch/amd64/s_lrint.S says:

ENTRY(lrint)
RETGUARD_SETUP(lrint, r11)
cvtsd2si %xmm0, %rax
RETGUARD_CHECK(lrint, r11)
ret
END(lrint)

So isn't that already used anyway?
If so, what's the point of replacing lrint
with _mm_cvtsd_si32(_mm_load_sd()) ?

Jan



> > > > https://github.com/libsndfile/libsndfile/pull/663
> > > > -> https://quick-bench.com/q/OabKT-gEOZ8CYDriy1JEwq1lEsg
> > > > where there's a huge difference in clang builds.
> > > 
> > > Sorry, I don't understand at all how this concerns
> > > the OpenBSD port of libsamplerate: the Benchmark does not
> > > mention an OS or an architecture, so what is this being run on?
> > > 
> > > Anyway, just running it (Run Benchmark) gives the result
> > > of cpu_time of 722.537 for BM_d2les_array (using lrint)
> > > and cpu_time of 0 for BM_d2les_array_sse2 (using psf_lrint),
> > > reporting a speedup ratio of 200,000,000.
> > > 
> > > That's not an example of what I have in mind: a simple application
> > > of libsamplerate, sped up by the usage of the new SSE2 lrint
> 
> > OK, here is a test that's a modified version of what Stuart linked,
> > testing the performance of the lrint() itself (code below).
> 
> A better test below, lrint()ing a random sequence.
> The SSE version is slower on every SSE2 machine I tried.
> Is that the case for you too?
> 
>   Jan
> 
> 
> #include 
> #include 
> 
> static inline int 
> psf_lrint(double const x)
> {
>   return _mm_cvtsd_si32(_mm_load_sd());
> }
> 
> static void
> d2l(const double *src, long *dst, size_t len)
> {
>   for (size_t i = 0; i < len; i++)
>   dst[i] = lrint(src[i]);
> }
> 
> static void
> d2l_sse(const double *src, long *dst, size_t len)
> {
>   for (size_t i = 0; i < len; i++)
>   dst[i] = psf_lrint(src[i]);
> }
> 
> int
> main()
> {
>   size_t i, len = 1000 * 1000 * 100;
>   double *src = NULL;
>   long *dst = NULL;
> 
>   src = calloc(len, sizeof(double));
>   dst = calloc(len, sizeof(long));
> 
>   arc4random_buf(src, len * sizeof(double));
>   d2l_sse(src, dst, len);
>   /*d2l(src, dst, len);*/
> 
>   return 0;
> }



Re: UPDATE: libsamplerate

2024-05-03 Thread Jan Stary
> > > > > > On Apr 26 20:46:51, b...@comstyle.com wrote:
> > > > > > > Implement SSE2 lrint() and lrintf() on amd64.
> > > > > > 
> > > > > > I don't think this is worth the added complexity:
> > > > > > seven more patches to have a different lrint()?
> > > > > > Does it make the resampling noticably better/faster?
> > > > > 
> > > https://github.com/libsndfile/libsndfile/pull/663
> > > -> https://quick-bench.com/q/OabKT-gEOZ8CYDriy1JEwq1lEsg
> > > where there's a huge difference in clang builds.
> > 
> > Sorry, I don't understand at all how this concerns
> > the OpenBSD port of libsamplerate: the Benchmark does not
> > mention an OS or an architecture, so what is this being run on?
> > 
> > Anyway, just running it (Run Benchmark) gives the result
> > of cpu_time of 722.537 for BM_d2les_array (using lrint)
> > and cpu_time of 0 for BM_d2les_array_sse2 (using psf_lrint),
> > reporting a speedup ratio of 200,000,000.
> > 
> > That's not an example of what I have in mind: a simple application
> > of libsamplerate, sped up by the usage of the new SSE2 lrint

> OK, here is a test that's a modified version of what Stuart linked,
> testing the performance of the lrint() itself (code below).

A better test below, lrint()ing a random sequence.
The SSE version is slower on every SSE2 machine I tried.
Is that the case for you too?

Jan


#include 
#include 

static inline int 
psf_lrint(double const x)
{
return _mm_cvtsd_si32(_mm_load_sd());
}

static void
d2l(const double *src, long *dst, size_t len)
{
for (size_t i = 0; i < len; i++)
dst[i] = lrint(src[i]);
}

static void
d2l_sse(const double *src, long *dst, size_t len)
{
for (size_t i = 0; i < len; i++)
dst[i] = psf_lrint(src[i]);
}

int
main()
{
size_t i, len = 1000 * 1000 * 100;
double *src = NULL;
long *dst = NULL;

src = calloc(len, sizeof(double));
dst = calloc(len, sizeof(long));

arc4random_buf(src, len * sizeof(double));
d2l_sse(src, dst, len);
/*d2l(src, dst, len);*/

return 0;
}



Re: UPDATE: libsamplerate

2024-05-03 Thread Jan Stary
On May 02 14:29:26, h...@stare.cz wrote:
> On May 02 13:04:54, s...@spacehopper.org wrote:
> > On 2024/05/01 21:04, Jan Stary wrote:
> > > On May 01 11:00:12, s...@spacehopper.org wrote:
> > > > On 2024/05/01 11:21, Jan Stary wrote:
> > > > > Hi,
> > > > > 
> > > > > On Apr 26 20:46:51, b...@comstyle.com wrote:
> > > > > > Implement SSE2 lrint() and lrintf() on amd64.
> > > > > 
> > > > > I don't think this is worth the added complexity:
> > > > > seven more patches to have a different lrint()?
> > > > > Does it make the resampling noticably better/faster?
> > > > 
> > > > Playing with the benchmark mentioned in
> > > > https://github.com/libsndfile/libsamplerate/issues/187
> > > > suggests that it's going to be *hugely* faster with clang (and a bit
> > > > faster with gcc).
> > > 
> > > This talks about a MSVC build compared to a MinGW64 build on windows.
> > > Is that also relevant to an AMD64 build on OpenBSD? I just rebuilt
> > > with the diff - what would be a good way to test the actual performance
> > > before and after?
> > 
> > oh, actually it was the bench in the linked PR that I played with,
> > 
> > https://github.com/libsndfile/libsndfile/pull/663
> > -> https://quick-bench.com/q/OabKT-gEOZ8CYDriy1JEwq1lEsg
> > 
> > where there's a huge difference in clang builds.
> 
> Sorry, I don't understand at all how this concerns
> the OpenBSD port of libsamplerate: the Benchmark does not
> mention an OS or an architecture, so what is this being run on?
> 
> Anyway, just running it (Run Benchmark) gives the result
> of cpu_time of 722.537 for BM_d2les_array (using lrint)
> and cpu_time of 0 for BM_d2les_array_sse2 (using psf_lrint),
> reporting a speedup ratio of 200,000,000.
> 
> That's not an example of what I have in mind: a simple application
> of libsamplerate, sped up by the usage of the new SSE2 lrint,
> as in Brad's diff.
> 
> I am not sure my naive test is a test at all, as it operates on floats,
> so perhaps lrint() never even comes to play. That is libsamplerate's
> "simple API" - I will try to come up with something that actualy
> conevrts to ints while resampling. But maybe someone already has
> a good example of such a speedup.

OK, here is a test that's a modified version of what Stuart linked,
testing the performance of the lrint() itself (code below).

This is a current/amd64 PC, clang version 16.0.6
It is actualy _slower_ than the standard version.

With the standard lrint():

0m10.90s real 0m03.75s user 0m05.66s system
0m11.01s real 0m03.56s user 0m05.96s system
0m10.99s real 0m03.67s user 0m05.82s system

With the SSE2 lrint():

0m12.92s real 0m05.74s user 0m05.63s system
0m12.77s real 0m05.15s user 0m06.12s system
0m12.66s real 0m05.57s user 0m05.62s system

Can you please confirm it is also slower
on your clang machine with SSE2?

Jan



#include 
#include 

static inline int 
psf_lrint(double const x)
{
return _mm_cvtsd_si32(_mm_load_sd());
}

static void
d2l(const double *src, long *dst, size_t len)
{
for (size_t i = 0; i < len; i++)
dst[i] = lrint(src[i]);
}

static void
d2l_sse(const double *src, long *dst, size_t len)
{
for (size_t i = 0; i < len; i++)
dst[i] = psf_lrint(src[i]);
}

int
main()
{
size_t i, len = 5;
double *src = NULL;
long *dst = NULL;

src = calloc(len, sizeof(double));
dst = calloc(len, sizeof(long));

for (i = 0; i < len; i++) {
/*src[i] = sin(i);*/
src[i] = 0;
}

/*d2l(src, dst, len);*/
d2l_sse(src, dst, len);

return 0;
}



Re: UPDATE: libsamplerate

2024-05-02 Thread Kirill A . Korinsky
On Thu, 02 May 2024 14:29:26 +0200,
Jan Stary  wrote:
> 
> Sorry, I don't understand at all how this concerns
> the OpenBSD port of libsamplerate: the Benchmark does not
> mention an OS or an architecture, so what is this being run on?
>

Because it seems like a magic. Special in the case of clang.

I don't belive in magic, and I've a bit changed result to check that it
really works, and result is quite different:
https://quick-bench.com/q/twMsv0sSWQvlWFjg7P0vfISBMUk

-- 
wbr, Kirill



Re: UPDATE: libsamplerate

2024-05-02 Thread Jan Stary
On May 02 13:04:54, s...@spacehopper.org wrote:
> On 2024/05/01 21:04, Jan Stary wrote:
> > On May 01 11:00:12, s...@spacehopper.org wrote:
> > > On 2024/05/01 11:21, Jan Stary wrote:
> > > > Hi,
> > > > 
> > > > On Apr 26 20:46:51, b...@comstyle.com wrote:
> > > > > Implement SSE2 lrint() and lrintf() on amd64.
> > > > 
> > > > I don't think this is worth the added complexity:
> > > > seven more patches to have a different lrint()?
> > > > Does it make the resampling noticably better/faster?
> > > 
> > > Playing with the benchmark mentioned in
> > > https://github.com/libsndfile/libsamplerate/issues/187
> > > suggests that it's going to be *hugely* faster with clang (and a bit
> > > faster with gcc).
> > 
> > This talks about a MSVC build compared to a MinGW64 build on windows.
> > Is that also relevant to an AMD64 build on OpenBSD? I just rebuilt
> > with the diff - what would be a good way to test the actual performance
> > before and after?
> 
> oh, actually it was the bench in the linked PR that I played with,
> 
> https://github.com/libsndfile/libsndfile/pull/663
> -> https://quick-bench.com/q/OabKT-gEOZ8CYDriy1JEwq1lEsg
> 
> where there's a huge difference in clang builds.

Sorry, I don't understand at all how this concerns
the OpenBSD port of libsamplerate: the Benchmark does not
mention an OS or an architecture, so what is this being run on?

Anyway, just running it (Run Benchmark) gives the result
of cpu_time of 722.537 for BM_d2les_array (using lrint)
and cpu_time of 0 for BM_d2les_array_sse2 (using psf_lrint),
reporting a speedup ratio of 200,000,000.

That's not an example of what I have in mind: a simple application
of libsamplerate, sped up by the usage of the new SSE2 lrint,
as in Brad's diff.

I am not sure my naive test is a test at all, as it operates on floats,
so perhaps lrint() never even comes to play. That is libsamplerate's
"simple API" - I will try to come up with something that actualy
conevrts to ints while resampling. But maybe someone already has
a good example of such a speedup.


Jan





> On 2024/05/01 22:14, Jan Stary wrote:
> > > what would be a good way to test the actual performance before and after?
> 
> any suggestions Brad?
> 
> > OK, here's a naive example: using SRC_LINEAR,
> > convert 4 hours of silence from 48000 to 44100.
> > 
> > Before:
> > 
> > 0m17.23s real 0m11.63s user 0m03.52s system
> > 0m17.03s real 0m11.35s user 0m03.58s system
> > 0m17.55s real 0m11.68s user 0m03.72s system
> > 
> > After:
> > 
> > 0m17.98s real 0m12.40s user 0m03.41s system
> > 0m17.98s real 0m12.13s user 0m03.78s system
> > 0m18.10s real 0m12.44s user 0m03.57s system
> > 
> > Same thing with four hours worth of a sine wave:
> > 
> > Before:
> > 
> > 0m29.87s real 0m24.28s user 0m03.42s system
> > 0m29.85s real 0m23.79s user 0m03.77s system
> > 0m29.75s real 0m24.28s user 0m03.21s system
> > 
> > After:
> > 
> > 0m30.54s real 0m24.91s user 0m03.55s system
> > 0m30.51s real 0m24.70s user 0m03.64s system
> > 0m30.65s real 0m24.91s user 0m03.44s system
> > 
> > This is an amd64 machine using clang 16.0.6
> > Is my test naive? Am I missing something?
> > (How much lrintf gets used inside this?)
> > 
> > Jan
> > 
> > 
> > 
> > OpenBSD 7.5-current (GENERIC.MP) #34: Sat Apr 27 21:19:57 MDT 2024
> > dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
> > real mem = 8285454336 (7901MB)
> > avail mem = 8013254656 (7642MB)
> > random: good seed from bootblocks
> > mpath0 at root
> > scsibus0 at mpath0: 256 targets
> > mainbus0 at root
> > bios0 at mainbus0: SMBIOS rev. 2.4 @ 0xf0100 (36 entries)
> > bios0: vendor Award Software International, Inc. version "F3" date 
> > 03/31/2011
> > bios0: Gigabyte Technology Co., Ltd. H67MA-USB3-B3
> > acpi0 at bios0: ACPI 1.0
> > acpi0: sleep states S0 S3 S4 S5
> > acpi0: tables DSDT FACP HPET MCFG ASPT SSPT EUDS MATS TAMG APIC SSDT
> > acpi0: wakeup devices PCI0(S5) PEX0(S5) PEX1(S5) PEX2(S5) PEX3(S5) PEX4(S5) 
> > PEX5(S5) PEX6(S5) PEX7(S5) HUB0(S5) UAR1(S3) USBE(S3) USE2(S3) AZAL(S5)
> > acpitimer0 at acpi0: 3579545 Hz, 24 bits
> > acpihpet0 at acpi0: 14318179 Hz
> > acpimcfg0 at acpi0
> > acpimcfg0: addr 0xf400, bus 0-63
> > acpimadt0 at acpi0 addr 0xfee0: PC-AT compat
> > cpu0 at mainbus0: apid 0 (boot processor)
> > cpu0: Intel(R) Core(TM) i7-2600 CPU @ 3.40GHz, 3492.09 MHz, 06-2a-07, patch 
> > 002f
> > cpu0: 
> > FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,AES,XSAVE,AVX,NXE,RDTSCP,LONG,LAHF,PERF,ITSC,MD_CLEAR,IBRS,IBPB,STIBP,L1DF,SSBD,SENSOR,ARAT,XSAVEOPT,MELTDOWN
> > cpu0: 32KB 64b/line 8-way D-cache, 32KB 64b/line 8-way I-cache, 256KB 
> > 64b/line 8-way L2 cache, 8MB 64b/line 16-way L3 cache
> > cpu0: smt 0, core 0, package 

Re: UPDATE: libsamplerate

2024-05-02 Thread Stuart Henderson
On 2024/05/01 21:04, Jan Stary wrote:
> On May 01 11:00:12, s...@spacehopper.org wrote:
> > On 2024/05/01 11:21, Jan Stary wrote:
> > > Hi,
> > > 
> > > On Apr 26 20:46:51, b...@comstyle.com wrote:
> > > > Implement SSE2 lrint() and lrintf() on amd64.
> > > 
> > > I don't think this is worth the added complexity:
> > > seven more patches to have a different lrint()?
> > > Does it make the resampling noticably better/faster?
> > 
> > Playing with the benchmark mentioned in
> > https://github.com/libsndfile/libsamplerate/issues/187
> > suggests that it's going to be *hugely* faster with clang (and a bit
> > faster with gcc).
> 
> This talks about a MSVC build compared to a MinGW64 build on windows.
> Is that also relevant to an AMD64 build on OpenBSD? I just rebuilt
> with the diff - what would be a good way to test the actual performance
> before and after?

oh, actually it was the bench in the linked PR that I played with,

https://github.com/libsndfile/libsndfile/pull/663
-> https://quick-bench.com/q/OabKT-gEOZ8CYDriy1JEwq1lEsg

where there's a huge difference in clang builds.

On 2024/05/01 22:14, Jan Stary wrote:
> > what would be a good way to test the actual performance before and after?

any suggestions Brad?

> OK, here's a naive example: using SRC_LINEAR,
> convert 4 hours of silence from 48000 to 44100.
> 
> Before:
> 
> 0m17.23s real 0m11.63s user 0m03.52s system
> 0m17.03s real 0m11.35s user 0m03.58s system
> 0m17.55s real 0m11.68s user 0m03.72s system
> 
> After:
> 
> 0m17.98s real 0m12.40s user 0m03.41s system
> 0m17.98s real 0m12.13s user 0m03.78s system
> 0m18.10s real 0m12.44s user 0m03.57s system
> 
> Same thing with four hours worth of a sine wave:
> 
> Before:
> 
> 0m29.87s real 0m24.28s user 0m03.42s system
> 0m29.85s real 0m23.79s user 0m03.77s system
> 0m29.75s real 0m24.28s user 0m03.21s system
> 
> After:
> 
> 0m30.54s real 0m24.91s user 0m03.55s system
> 0m30.51s real 0m24.70s user 0m03.64s system
> 0m30.65s real 0m24.91s user 0m03.44s system
> 
> This is an amd64 machine using clang 16.0.6
> Is my test naive? Am I missing something?
> (How much lrintf gets used inside this?)
> 
>   Jan
> 
> 
> 
> OpenBSD 7.5-current (GENERIC.MP) #34: Sat Apr 27 21:19:57 MDT 2024
> dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
> real mem = 8285454336 (7901MB)
> avail mem = 8013254656 (7642MB)
> random: good seed from bootblocks
> mpath0 at root
> scsibus0 at mpath0: 256 targets
> mainbus0 at root
> bios0 at mainbus0: SMBIOS rev. 2.4 @ 0xf0100 (36 entries)
> bios0: vendor Award Software International, Inc. version "F3" date 03/31/2011
> bios0: Gigabyte Technology Co., Ltd. H67MA-USB3-B3
> acpi0 at bios0: ACPI 1.0
> acpi0: sleep states S0 S3 S4 S5
> acpi0: tables DSDT FACP HPET MCFG ASPT SSPT EUDS MATS TAMG APIC SSDT
> acpi0: wakeup devices PCI0(S5) PEX0(S5) PEX1(S5) PEX2(S5) PEX3(S5) PEX4(S5) 
> PEX5(S5) PEX6(S5) PEX7(S5) HUB0(S5) UAR1(S3) USBE(S3) USE2(S3) AZAL(S5)
> acpitimer0 at acpi0: 3579545 Hz, 24 bits
> acpihpet0 at acpi0: 14318179 Hz
> acpimcfg0 at acpi0
> acpimcfg0: addr 0xf400, bus 0-63
> acpimadt0 at acpi0 addr 0xfee0: PC-AT compat
> cpu0 at mainbus0: apid 0 (boot processor)
> cpu0: Intel(R) Core(TM) i7-2600 CPU @ 3.40GHz, 3492.09 MHz, 06-2a-07, patch 
> 002f
> cpu0: 
> FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,AES,XSAVE,AVX,NXE,RDTSCP,LONG,LAHF,PERF,ITSC,MD_CLEAR,IBRS,IBPB,STIBP,L1DF,SSBD,SENSOR,ARAT,XSAVEOPT,MELTDOWN
> cpu0: 32KB 64b/line 8-way D-cache, 32KB 64b/line 8-way I-cache, 256KB 
> 64b/line 8-way L2 cache, 8MB 64b/line 16-way L3 cache
> cpu0: smt 0, core 0, package 0
> mtrr: Pentium Pro MTRR support, 10 var ranges, 88 fixed ranges
> cpu0: apic clock running at 99MHz
> cpu0: mwait min=64, max=64, C-substates=0.2.1.1, IBE
> cpu1 at mainbus0: apid 2 (application processor)
> cpu1: Intel(R) Core(TM) i7-2600 CPU @ 3.40GHz, 3492.12 MHz, 06-2a-07, patch 
> 002f
> cpu1: 
> FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,AES,XSAVE,AVX,NXE,RDTSCP,LONG,LAHF,PERF,ITSC,MD_CLEAR,IBRS,IBPB,STIBP,L1DF,SSBD,SENSOR,ARAT,XSAVEOPT,MELTDOWN
> cpu1: 32KB 64b/line 8-way D-cache, 32KB 64b/line 8-way I-cache, 256KB 
> 64b/line 8-way L2 cache, 8MB 64b/line 16-way L3 cache
> cpu1: smt 0, core 1, package 0
> cpu2 at mainbus0: apid 4 (application processor)
> cpu2: Intel(R) Core(TM) i7-2600 CPU @ 3.40GHz, 3492.19 MHz, 06-2a-07, patch 
> 002f
> cpu2: 
> 

Re: UPDATE: libsamplerate

2024-05-01 Thread Jan Stary
> > > On Apr 26 20:46:51, b...@comstyle.com wrote:
> > > > Implement SSE2 lrint() and lrintf() on amd64.
> > > Does it make the resampling noticably better/faster?
> > 
> > Playing with the benchmark mentioned in
> > https://github.com/libsndfile/libsamplerate/issues/187
> > suggests that it's going to be *hugely* faster with clang
> 
> what would be a good way to test the actual performance before and after?

OK, here's a naive example: using SRC_LINEAR,
convert 4 hours of silence from 48000 to 44100.

Before:

0m17.23s real 0m11.63s user 0m03.52s system
0m17.03s real 0m11.35s user 0m03.58s system
0m17.55s real 0m11.68s user 0m03.72s system

After:

0m17.98s real 0m12.40s user 0m03.41s system
0m17.98s real 0m12.13s user 0m03.78s system
0m18.10s real 0m12.44s user 0m03.57s system

Same thing with four hours worth of a sine wave:

Before:

0m29.87s real 0m24.28s user 0m03.42s system
0m29.85s real 0m23.79s user 0m03.77s system
0m29.75s real 0m24.28s user 0m03.21s system

After:

0m30.54s real 0m24.91s user 0m03.55s system
0m30.51s real 0m24.70s user 0m03.64s system
0m30.65s real 0m24.91s user 0m03.44s system

This is an amd64 machine using clang 16.0.6
Is my test naive? Am I missing something?
(How much lrintf gets used inside this?)

Jan



OpenBSD 7.5-current (GENERIC.MP) #34: Sat Apr 27 21:19:57 MDT 2024
dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
real mem = 8285454336 (7901MB)
avail mem = 8013254656 (7642MB)
random: good seed from bootblocks
mpath0 at root
scsibus0 at mpath0: 256 targets
mainbus0 at root
bios0 at mainbus0: SMBIOS rev. 2.4 @ 0xf0100 (36 entries)
bios0: vendor Award Software International, Inc. version "F3" date 03/31/2011
bios0: Gigabyte Technology Co., Ltd. H67MA-USB3-B3
acpi0 at bios0: ACPI 1.0
acpi0: sleep states S0 S3 S4 S5
acpi0: tables DSDT FACP HPET MCFG ASPT SSPT EUDS MATS TAMG APIC SSDT
acpi0: wakeup devices PCI0(S5) PEX0(S5) PEX1(S5) PEX2(S5) PEX3(S5) PEX4(S5) 
PEX5(S5) PEX6(S5) PEX7(S5) HUB0(S5) UAR1(S3) USBE(S3) USE2(S3) AZAL(S5)
acpitimer0 at acpi0: 3579545 Hz, 24 bits
acpihpet0 at acpi0: 14318179 Hz
acpimcfg0 at acpi0
acpimcfg0: addr 0xf400, bus 0-63
acpimadt0 at acpi0 addr 0xfee0: PC-AT compat
cpu0 at mainbus0: apid 0 (boot processor)
cpu0: Intel(R) Core(TM) i7-2600 CPU @ 3.40GHz, 3492.09 MHz, 06-2a-07, patch 
002f
cpu0: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,AES,XSAVE,AVX,NXE,RDTSCP,LONG,LAHF,PERF,ITSC,MD_CLEAR,IBRS,IBPB,STIBP,L1DF,SSBD,SENSOR,ARAT,XSAVEOPT,MELTDOWN
cpu0: 32KB 64b/line 8-way D-cache, 32KB 64b/line 8-way I-cache, 256KB 64b/line 
8-way L2 cache, 8MB 64b/line 16-way L3 cache
cpu0: smt 0, core 0, package 0
mtrr: Pentium Pro MTRR support, 10 var ranges, 88 fixed ranges
cpu0: apic clock running at 99MHz
cpu0: mwait min=64, max=64, C-substates=0.2.1.1, IBE
cpu1 at mainbus0: apid 2 (application processor)
cpu1: Intel(R) Core(TM) i7-2600 CPU @ 3.40GHz, 3492.12 MHz, 06-2a-07, patch 
002f
cpu1: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,AES,XSAVE,AVX,NXE,RDTSCP,LONG,LAHF,PERF,ITSC,MD_CLEAR,IBRS,IBPB,STIBP,L1DF,SSBD,SENSOR,ARAT,XSAVEOPT,MELTDOWN
cpu1: 32KB 64b/line 8-way D-cache, 32KB 64b/line 8-way I-cache, 256KB 64b/line 
8-way L2 cache, 8MB 64b/line 16-way L3 cache
cpu1: smt 0, core 1, package 0
cpu2 at mainbus0: apid 4 (application processor)
cpu2: Intel(R) Core(TM) i7-2600 CPU @ 3.40GHz, 3492.19 MHz, 06-2a-07, patch 
002f
cpu2: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,AES,XSAVE,AVX,NXE,RDTSCP,LONG,LAHF,PERF,ITSC,MD_CLEAR,IBRS,IBPB,STIBP,L1DF,SSBD,SENSOR,ARAT,XSAVEOPT,MELTDOWN
cpu2: 32KB 64b/line 8-way D-cache, 32KB 64b/line 8-way I-cache, 256KB 64b/line 
8-way L2 cache, 8MB 64b/line 16-way L3 cache
cpu2: smt 0, core 2, package 0
cpu3 at mainbus0: apid 6 (application processor)
cpu3: Intel(R) Core(TM) i7-2600 CPU @ 3.40GHz, 3492.25 MHz, 06-2a-07, patch 
002f
cpu3: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,AES,XSAVE,AVX,NXE,RDTSCP,LONG,LAHF,PERF,ITSC,MD_CLEAR,IBRS,IBPB,STIBP,L1DF,SSBD,SENSOR,ARAT,XSAVEOPT,MELTDOWN
cpu3: 32KB 64b/line 8-way D-cache, 32KB 64b/line 8-way I-cache, 256KB 64b/line 
8-way L2 cache, 8MB 64b/line 16-way L3 cache
cpu3: smt 0, core 3, package 

Re: UPDATE: libsamplerate

2024-05-01 Thread Jan Stary
On May 01 11:00:12, s...@spacehopper.org wrote:
> On 2024/05/01 11:21, Jan Stary wrote:
> > Hi,
> > 
> > On Apr 26 20:46:51, b...@comstyle.com wrote:
> > > Implement SSE2 lrint() and lrintf() on amd64.
> > 
> > I don't think this is worth the added complexity:
> > seven more patches to have a different lrint()?
> > Does it make the resampling noticably better/faster?
> 
> Playing with the benchmark mentioned in
> https://github.com/libsndfile/libsamplerate/issues/187
> suggests that it's going to be *hugely* faster with clang (and a bit
> faster with gcc).

This talks about a MSVC build compared to a MinGW64 build on windows.
Is that also relevant to an AMD64 build on OpenBSD? I just rebuilt
with the diff - what would be a good way to test the actual performance
before and after?

Jan



Re: UPDATE: libsamplerate

2024-05-01 Thread Stuart Henderson
On 2024/05/01 11:21, Jan Stary wrote:
> Hi,
> 
> On Apr 26 20:46:51, b...@comstyle.com wrote:
> > Implement SSE2 lrint() and lrintf() on amd64.
> 
> I don't think this is worth the added complexity:
> seven more patches to have a different lrint()?
> Does it make the resampling noticably better/faster?

Playing with the benchmark mentioned in
https://github.com/libsndfile/libsamplerate/issues/187
suggests that it's going to be *hugely* faster with clang (and a bit
faster with gcc).

> Also, the patch changes the CONFIGURE_STYLE from gnu to autoreconf
> and hardwires the autoconf and automake version (without explicitly
> depending on them) - presumably because configure.ac is patched
> so ./configure must be recreated.
> This seems to basicaly replicate the SSE2 github commit(s) in the port.

Exactly, that is the best way to do it.

For code changes use a patch direct from an upstream commit, or as close
as possible.

For autoconf, patch the input files and regenerate. Patching the output
files is much more likely to result in breakage at update time.

> I would wait for a release that will already contain this.

The last release was 3 years ago so that could be quite some wait.

An alternative would be to bump the port to a hash-based git archive
download, though I prefer making this sort of change as a targetted
patch like this.

ok sthen FWIW

> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/audio/libsamplerate/Makefile,v
> > retrieving revision 1.27
> > diff -u -p -u -p -r1.27 Makefile
> > --- Makefile5 Sep 2023 16:13:38 -   1.27
> > +++ Makefile27 Apr 2024 00:26:05 -
> > @@ -2,7 +2,7 @@ COMMENT=audio sample rate conversion li
> >  
> >  VER=   0.2.2
> >  DISTNAME=  libsamplerate-${VER}
> > -REVISION=  0
> > +REVISION=  1
> >  CATEGORIES=audio
> >  EXTRACT_SUFX=  .tar.xz
> >  
> > @@ -18,7 +18,9 @@ SITES=https://github.com/libsndfile/lib
> >  
> >  WANTLIB=   m
> >  
> > -CONFIGURE_STYLE=gnu
> > +AUTOCONF_VERSION=  2.71
> > +AUTOMAKE_VERSION=  1.16
> > +CONFIGURE_STYLE=autoreconf
> >  CONFIGURE_ARGS=--disable-cpu-clip \
> > --disable-fftw \
> > --disable-sndfile
> > Index: patches/patch-configure_ac
> > ===
> > RCS file: patches/patch-configure_ac
> > diff -N patches/patch-configure_ac
> > --- /dev/null   1 Jan 1970 00:00:00 -
> > +++ patches/patch-configure_ac  27 Apr 2024 00:26:05 -
> > @@ -0,0 +1,43 @@
> > +- Implement SSE2 lrint() and lrintf()
> > +  7a81766b14fa03e97822cf1e0b1651648df13116
> > +- use sse2 intrinsics for lrint/lrintf only on windows x64
> > +  c01e2405612ad3561bf93e8e6dddb9ba0dffe4d9
> > +- sse2 lrint/lrintf updates
> > +  c164eaa25ffdeedc7d25e731172cc45a25f483d4
> > +
> > +Index: configure.ac
> > +--- configure.ac.orig
> >  configure.ac
> > +@@ -89,7 +89,7 @@ m4_define([abi_version_patch], [lt_revision])
> > + 
> > + dnl 
> > 
> > + 
> > +-AC_CHECK_HEADERS([stdbool.h stdint.h sys/times.h unistd.h])
> > ++AC_CHECK_HEADERS([stdbool.h stdint.h sys/times.h unistd.h immintrin.h])
> > + 
> > + dnl 
> > 
> > + dnl  Couple of initializations here. Fill in real values later.
> > +@@ -105,6 +105,9 @@ AC_ARG_ENABLE([werror],
> > + AC_ARG_ENABLE([cpu-clip],
> > +   [AS_HELP_STRING([--disable-cpu-clip], [disable tricky cpu specific 
> > clipper])])
> > + 
> > ++AC_ARG_ENABLE([sse2-lrint],
> > ++  [AS_HELP_STRING([--enable-sse2-lrint], [implement lrintf using SSE2 on 
> > x86 CPUs if possible])])
> > ++
> > + AC_ARG_ENABLE([sndfile],
> > +   [AS_HELP_STRING([--disable-sndfile], [disable support for sndfile 
> > (default=autodetect)])], [], [enable_sndfile=auto])
> > + 
> > +@@ -178,6 +181,13 @@ AS_IF([test "x$enable_cpu_clip" != "xno"], [
> > + 
> > + AC_DEFINE_UNQUOTED([CPU_CLIPS_POSITIVE], [${ac_cv_c_clip_positive}], 
> > [Host processor clips on positive float to int conversion.])
> > + AC_DEFINE_UNQUOTED([CPU_CLIPS_NEGATIVE], [${ac_cv_c_clip_negative}], 
> > [Host processor clips on negative float to int conversion.])
> > ++
> > ++dnl 
> > 
> > ++dnl  Determine if the user enabled lrint implementations using SSE2.
> > ++
> > ++AS_IF([test "x$enable_sse2_lrint" = "xyes"], [
> > ++  CFLAGS="$CFLAGS -DENABLE_SSE2_LRINT"
> > ++  ])
> > + 
> > + dnl 
> > 
> > + dnl  Check for libsndfile which is required for the test and example 
> > programs.
> > Index: patches/patch-examples_audio_out_c
> > ===
> > RCS file: patches/patch-examples_audio_out_c
> > diff -N 

Re: UPDATE: libsamplerate

2024-05-01 Thread Jan Stary
Hi,

On Apr 26 20:46:51, b...@comstyle.com wrote:
> Implement SSE2 lrint() and lrintf() on amd64.

I don't think this is worth the added complexity:
seven more patches to have a different lrint()?
Does it make the resampling noticably better/faster?

Also, the patch changes the CONFIGURE_STYLE from gnu to autoreconf
and hardwires the autoconf and automake version (without explicitly
depending on them) - presumably because configure.ac is patched
so ./configure must be recreated.

This seems to basicaly replicate the SSE2 github commit(s) in the port.
I would wait for a release that will already contain this.

Jan




> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/audio/libsamplerate/Makefile,v
> retrieving revision 1.27
> diff -u -p -u -p -r1.27 Makefile
> --- Makefile  5 Sep 2023 16:13:38 -   1.27
> +++ Makefile  27 Apr 2024 00:26:05 -
> @@ -2,7 +2,7 @@ COMMENT=  audio sample rate conversion li
>  
>  VER= 0.2.2
>  DISTNAME=libsamplerate-${VER}
> -REVISION=0
> +REVISION=1
>  CATEGORIES=  audio
>  EXTRACT_SUFX=.tar.xz
>  
> @@ -18,7 +18,9 @@ SITES=  https://github.com/libsndfile/lib
>  
>  WANTLIB= m
>  
> -CONFIGURE_STYLE=gnu
> +AUTOCONF_VERSION=2.71
> +AUTOMAKE_VERSION=1.16
> +CONFIGURE_STYLE=autoreconf
>  CONFIGURE_ARGS=  --disable-cpu-clip \
>   --disable-fftw \
>   --disable-sndfile
> Index: patches/patch-configure_ac
> ===
> RCS file: patches/patch-configure_ac
> diff -N patches/patch-configure_ac
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-configure_ac27 Apr 2024 00:26:05 -
> @@ -0,0 +1,43 @@
> +- Implement SSE2 lrint() and lrintf()
> +  7a81766b14fa03e97822cf1e0b1651648df13116
> +- use sse2 intrinsics for lrint/lrintf only on windows x64
> +  c01e2405612ad3561bf93e8e6dddb9ba0dffe4d9
> +- sse2 lrint/lrintf updates
> +  c164eaa25ffdeedc7d25e731172cc45a25f483d4
> +
> +Index: configure.ac
> +--- configure.ac.orig
>  configure.ac
> +@@ -89,7 +89,7 @@ m4_define([abi_version_patch], [lt_revision])
> + 
> + dnl 
> 
> + 
> +-AC_CHECK_HEADERS([stdbool.h stdint.h sys/times.h unistd.h])
> ++AC_CHECK_HEADERS([stdbool.h stdint.h sys/times.h unistd.h immintrin.h])
> + 
> + dnl 
> 
> + dnl  Couple of initializations here. Fill in real values later.
> +@@ -105,6 +105,9 @@ AC_ARG_ENABLE([werror],
> + AC_ARG_ENABLE([cpu-clip],
> + [AS_HELP_STRING([--disable-cpu-clip], [disable tricky cpu specific 
> clipper])])
> + 
> ++AC_ARG_ENABLE([sse2-lrint],
> ++[AS_HELP_STRING([--enable-sse2-lrint], [implement lrintf using SSE2 on 
> x86 CPUs if possible])])
> ++
> + AC_ARG_ENABLE([sndfile],
> + [AS_HELP_STRING([--disable-sndfile], [disable support for sndfile 
> (default=autodetect)])], [], [enable_sndfile=auto])
> + 
> +@@ -178,6 +181,13 @@ AS_IF([test "x$enable_cpu_clip" != "xno"], [
> + 
> + AC_DEFINE_UNQUOTED([CPU_CLIPS_POSITIVE], [${ac_cv_c_clip_positive}], [Host 
> processor clips on positive float to int conversion.])
> + AC_DEFINE_UNQUOTED([CPU_CLIPS_NEGATIVE], [${ac_cv_c_clip_negative}], [Host 
> processor clips on negative float to int conversion.])
> ++
> ++dnl 
> 
> ++dnl  Determine if the user enabled lrint implementations using SSE2.
> ++
> ++AS_IF([test "x$enable_sse2_lrint" = "xyes"], [
> ++CFLAGS="$CFLAGS -DENABLE_SSE2_LRINT"
> ++])
> + 
> + dnl 
> 
> + dnl  Check for libsndfile which is required for the test and example 
> programs.
> Index: patches/patch-examples_audio_out_c
> ===
> RCS file: patches/patch-examples_audio_out_c
> diff -N patches/patch-examples_audio_out_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-examples_audio_out_c27 Apr 2024 00:26:05 -
> @@ -0,0 +1,19 @@
> +- Implement SSE2 lrint() and lrintf()
> +  7a81766b14fa03e97822cf1e0b1651648df13116
> +- use sse2 intrinsics for lrint/lrintf only on windows x64
> +  c01e2405612ad3561bf93e8e6dddb9ba0dffe4d9
> +- sse2 lrint/lrintf updates
> +  c164eaa25ffdeedc7d25e731172cc45a25f483d4
> +
> +Index: examples/audio_out.c
> +--- examples/audio_out.c.orig
>  examples/audio_out.c
> +@@ -960,7 +960,7 @@ solaris_play (get_audio_callback_t callback, AUDIO_OUT
> + 
> + while ((read_frames = callback (callback_data, float_buffer, BUFFER_LEN 
> / solaris_out->channels)))
> + {   for (k = 0 ; k < read_frames * solaris_out->channels ; k++)
> +-buffer [k] = lrint (32767.0 * float_buffer [k]) ;
> ++

Re: UPDATE: libsamplerate 0.2.1

2021-10-09 Thread Brad Smith
On Sat, Oct 09, 2021 at 12:36:54AM -0400, Brad Smith wrote:
> On Sat, Sep 11, 2021 at 04:08:02PM -0400, Brad Smith wrote:
> > On Fri, Sep 03, 2021 at 10:51:25PM -0400, Brad Smith wrote:
> > > Here is an update to libsamplerate 0.2.1.
> > > 
> > > Version 0.2.1 (2021-01-23)
> > >   * Fix incorrect passing of -version-info to libtool, causing a
> > > regression on versioned file name of the shared library (#140).
> > >   * Fix time resolution on GNU/Hurd for throughput_test
> > >   * Update AUTHORS and release manager details
> > > 
> > > Version 0.2.0 (2021-01-21)
> > >   * API:
> > > * Add `src_clone()` function to clone a SRC_STATE* handle
> > >   * Cleanup Autotools build system.
> > >   * Require C99 compiler
> > >   * Move `sndfile-resample` to sndfile-tools package
> > >   * Add missing `src_get_channels`() export to windows def file
> > >   * Fix macOS compile errors and modernize audio api on that platform
> > >   * Add Octave scripts to generate filter coefficients
> > >   * Fix two potential undefined behaviours
> > >   * Fix a buffer out-of-bounds read error in src/src_sinc.c
> > >   * Improve multichan_throughput_test
> > >   * Replace buggy implementationg of Duffs device by regular loop
> > >   * CMake:
> > > * Fix CMake generated shared library ABI compliance with Autotools 
> > > build 
> > >   * Documentation:
> > > * Move site to new URL: http://libsndfile.github.io/libsamplerate/
> > > * Convert documentation pages from HTML to Markdown
> > > * Use GitHub's Jekyll static site generator to generate static HTML 
> > > pages
> > >   for site
> > 
> > Here is an update to libsamplerate 0.2.2.
> > 
> > Version 0.2.2 (2021-09-05)
> >   * Fix CMake overlinking for examples (#146)
> >   * Switch to GCC's visibility for hiding more implementation details
> >   * Check GNU ld instead of gcc for exported symbols control logic in
> > configure.ac
> >   * Disable static builds using Autotools by default. If you want static
> > libraries, pass --enable-static to ./configure
> >   * ABI version incompatibility between Autotools and CMake build on Apple
> > platforms.
> >   * Fixes and improvements for CMake build system.
> >   * Fixes and improvements for Autotools build system.
> >   * Switch to .xz over .bz2 for release tarballs.
> >   * Minor bug fixes and updates.
> 
> Updated the diff for -current..

Stuart pointed out there was an already made tarball which simplifies things
a bit..


Index: libsamplerate/Makefile
===
RCS file: /cvs/ports/audio/libsamplerate/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- libsamplerate/Makefile  12 Jul 2019 20:43:35 -  1.23
+++ libsamplerate/Makefile  9 Oct 2021 16:14:16 -
@@ -2,35 +2,26 @@
 
 COMMENT=   audio sample rate conversion library
 
-DISTNAME=  libsamplerate-0.1.9
-SHARED_LIBS=   samplerate  2.1
+VER=   0.2.2
+DISTNAME=  libsamplerate-${VER}
 CATEGORIES=audio
+EXTRACT_SUFX=  .tar.xz
 
-HOMEPAGE=  http://mega-nerd.com/SRC/
+SHARED_LIBS=   samplerate  3.0
+
+HOMEPAGE=  http://libsndfile.github.io/libsamplerate/
 MAINTAINER=Jan Stary 
 
 # 2-BSD license
 PERMIT_PACKAGE=Yes
 
-MASTER_SITES=  ${HOMEPAGE}
-
-WANTLIB=   FLAC c m ogg sndfile>=1 vorbis vorbisenc
+MASTER_SITES=  
https://github.com/libsndfile/libsamplerate/releases/download/${VER}/
 
-LIB_DEPENDS=   audio/libsndfile
+WANTLIB=   m
 
 CONFIGURE_STYLE=gnu
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
-   LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=--disable-cpu-clip \
-   --disable-fftw
-
-post-install:
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libsamplerate
-   ${INSTALL_DATA} ${WRKSRC}/doc/*.css \
-   ${PREFIX}/share/doc/libsamplerate
-   ${INSTALL_DATA} ${WRKSRC}/doc/*.png \
-   ${PREFIX}/share/doc/libsamplerate
-   ${INSTALL_DATA} ${WRKSRC}/doc/*.html \
-   ${PREFIX}/share/doc/libsamplerate
+   --disable-fftw \
+   --disable-sndfile
 
 .include 
Index: libsamplerate/distinfo
===
RCS file: /cvs/ports/audio/libsamplerate/distinfo,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 distinfo
--- libsamplerate/distinfo  7 Nov 2016 21:39:58 -   1.9
+++ libsamplerate/distinfo  9 Oct 2021 16:14:16 -
@@ -1,2 +1,2 @@
-SHA256 (libsamplerate-0.1.9.tar.gz) = 
Cn6xaOLyE1P7bYTaFS5FEhJvfcSMywvoBXjFZUE0RME=
-SIZE (libsamplerate-0.1.9.tar.gz) = 4336641
+SHA256 (libsamplerate-0.2.2.tar.xz) = 
MljaKAUR0ktJ1rCGFbvoJNDKzJhCsOTK8RxSzysEOJM=
+SIZE (libsamplerate-0.2.2.tar.xz) = 3319468
Index: libsamplerate/patches/patch-tests_util_c
===
RCS file: libsamplerate/patches/patch-tests_util_c
diff -N libsamplerate/patches/patch-tests_util_c
--- /dev/null   1 Jan 1970 

Re: UPDATE: libsamplerate 0.2.1

2021-10-09 Thread Brad Smith
On Sat, Sep 11, 2021 at 04:08:02PM -0400, Brad Smith wrote:
> On Fri, Sep 03, 2021 at 10:51:25PM -0400, Brad Smith wrote:
> > Here is an update to libsamplerate 0.2.1.
> > 
> > Version 0.2.1 (2021-01-23)
> >   * Fix incorrect passing of -version-info to libtool, causing a
> > regression on versioned file name of the shared library (#140).
> >   * Fix time resolution on GNU/Hurd for throughput_test
> >   * Update AUTHORS and release manager details
> > 
> > Version 0.2.0 (2021-01-21)
> >   * API:
> > * Add `src_clone()` function to clone a SRC_STATE* handle
> >   * Cleanup Autotools build system.
> >   * Require C99 compiler
> >   * Move `sndfile-resample` to sndfile-tools package
> >   * Add missing `src_get_channels`() export to windows def file
> >   * Fix macOS compile errors and modernize audio api on that platform
> >   * Add Octave scripts to generate filter coefficients
> >   * Fix two potential undefined behaviours
> >   * Fix a buffer out-of-bounds read error in src/src_sinc.c
> >   * Improve multichan_throughput_test
> >   * Replace buggy implementationg of Duffs device by regular loop
> >   * CMake:
> > * Fix CMake generated shared library ABI compliance with Autotools 
> > build 
> >   * Documentation:
> > * Move site to new URL: http://libsndfile.github.io/libsamplerate/
> > * Convert documentation pages from HTML to Markdown
> > * Use GitHub's Jekyll static site generator to generate static HTML 
> > pages
> >   for site
> 
> Here is an update to libsamplerate 0.2.2.
> 
> Version 0.2.2 (2021-09-05)
>   * Fix CMake overlinking for examples (#146)
>   * Switch to GCC's visibility for hiding more implementation details
>   * Check GNU ld instead of gcc for exported symbols control logic in
> configure.ac
>   * Disable static builds using Autotools by default. If you want static
> libraries, pass --enable-static to ./configure
>   * ABI version incompatibility between Autotools and CMake build on Apple
> platforms.
>   * Fixes and improvements for CMake build system.
>   * Fixes and improvements for Autotools build system.
>   * Switch to .xz over .bz2 for release tarballs.
>   * Minor bug fixes and updates.

Updated the diff for -current..


Index: libsamplerate/Makefile
===
RCS file: /cvs/ports/audio/libsamplerate/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- libsamplerate/Makefile  12 Jul 2019 20:43:35 -  1.23
+++ libsamplerate/Makefile  6 Oct 2021 04:25:26 -
@@ -2,35 +2,26 @@
 
 COMMENT=   audio sample rate conversion library
 
-DISTNAME=  libsamplerate-0.1.9
-SHARED_LIBS=   samplerate  2.1
+GH_ACCOUNT=libsndfile
+GH_PROJECT=libsamplerate
+GH_TAGNAME=0.2.2
 CATEGORIES=audio
 
-HOMEPAGE=  http://mega-nerd.com/SRC/
+SHARED_LIBS=   samplerate  3.0
+
+HOMEPAGE=  http://libsndfile.github.io/libsamplerate/
 MAINTAINER=Jan Stary 
 
 # 2-BSD license
 PERMIT_PACKAGE=Yes
 
-MASTER_SITES=  ${HOMEPAGE}
-
-WANTLIB=   FLAC c m ogg sndfile>=1 vorbis vorbisenc
+WANTLIB=   m
 
-LIB_DEPENDS=   audio/libsndfile
-
-CONFIGURE_STYLE=gnu
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
-   LDFLAGS="-L${LOCALBASE}/lib"
+AUTOCONF_VERSION=  2.69
+AUTOMAKE_VERSION=  1.16
+CONFIGURE_STYLE=autoreconf
 CONFIGURE_ARGS=--disable-cpu-clip \
-   --disable-fftw
-
-post-install:
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libsamplerate
-   ${INSTALL_DATA} ${WRKSRC}/doc/*.css \
-   ${PREFIX}/share/doc/libsamplerate
-   ${INSTALL_DATA} ${WRKSRC}/doc/*.png \
-   ${PREFIX}/share/doc/libsamplerate
-   ${INSTALL_DATA} ${WRKSRC}/doc/*.html \
-   ${PREFIX}/share/doc/libsamplerate
+   --disable-fftw \
+   --disable-sndfile
 
 .include 
Index: libsamplerate/distinfo
===
RCS file: /cvs/ports/audio/libsamplerate/distinfo,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 distinfo
--- libsamplerate/distinfo  7 Nov 2016 21:39:58 -   1.9
+++ libsamplerate/distinfo  6 Oct 2021 04:25:26 -
@@ -1,2 +1,2 @@
-SHA256 (libsamplerate-0.1.9.tar.gz) = 
Cn6xaOLyE1P7bYTaFS5FEhJvfcSMywvoBXjFZUE0RME=
-SIZE (libsamplerate-0.1.9.tar.gz) = 4336641
+SHA256 (libsamplerate-0.2.2.tar.gz) = 
FuiBSH8YQlDetPy2BDLXVWqxLLWMrqce8jlgrsbAQFo=
+SIZE (libsamplerate-0.2.2.tar.gz) = 3954784
Index: libsamplerate/patches/patch-tests_util_c
===
RCS file: libsamplerate/patches/patch-tests_util_c
diff -N libsamplerate/patches/patch-tests_util_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ libsamplerate/patches/patch-tests_util_c6 Oct 2021 04:25:26 -
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: tests/util.c
+--- tests/util.c.orig
 tests/util.c
+@@ -175,7 +175,7 @@ get_cpu_name (void)
+   file = popen 

Re: UPDATE: libsamplerate 0.2.1

2021-09-11 Thread Brad Smith
On Fri, Sep 03, 2021 at 10:51:25PM -0400, Brad Smith wrote:
> Here is an update to libsamplerate 0.2.1.
> 
> Version 0.2.1 (2021-01-23)
>   * Fix incorrect passing of -version-info to libtool, causing a
> regression on versioned file name of the shared library (#140).
>   * Fix time resolution on GNU/Hurd for throughput_test
>   * Update AUTHORS and release manager details
> 
> Version 0.2.0 (2021-01-21)
>   * API:
> * Add `src_clone()` function to clone a SRC_STATE* handle
>   * Cleanup Autotools build system.
>   * Require C99 compiler
>   * Move `sndfile-resample` to sndfile-tools package
>   * Add missing `src_get_channels`() export to windows def file
>   * Fix macOS compile errors and modernize audio api on that platform
>   * Add Octave scripts to generate filter coefficients
>   * Fix two potential undefined behaviours
>   * Fix a buffer out-of-bounds read error in src/src_sinc.c
>   * Improve multichan_throughput_test
>   * Replace buggy implementationg of Duffs device by regular loop
>   * CMake:
> * Fix CMake generated shared library ABI compliance with Autotools build 
>   * Documentation:
> * Move site to new URL: http://libsndfile.github.io/libsamplerate/
> * Convert documentation pages from HTML to Markdown
> * Use GitHub's Jekyll static site generator to generate static HTML pages
>   for site

Here is an update to libsamplerate 0.2.2.

Version 0.2.2 (2021-09-05)
  * Fix CMake overlinking for examples (#146)
  * Switch to GCC's visibility for hiding more implementation details
  * Check GNU ld instead of gcc for exported symbols control logic in
configure.ac
  * Disable static builds using Autotools by default. If you want static
libraries, pass --enable-static to ./configure
  * ABI version incompatibility between Autotools and CMake build on Apple
platforms.
  * Fixes and improvements for CMake build system.
  * Fixes and improvements for Autotools build system.
  * Switch to .xz over .bz2 for release tarballs.
  * Minor bug fixes and updates.


Index: libsamplerate/Makefile
===
RCS file: /cvs/ports/audio/libsamplerate/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- libsamplerate/Makefile  12 Jul 2019 20:43:35 -  1.23
+++ libsamplerate/Makefile  11 Sep 2021 19:58:37 -
@@ -2,35 +2,26 @@
 
 COMMENT=   audio sample rate conversion library
 
-DISTNAME=  libsamplerate-0.1.9
-SHARED_LIBS=   samplerate  2.1
+GH_ACCOUNT=libsndfile
+GH_PROJECT=libsamplerate
+GH_TAGNAME=0.2.2
 CATEGORIES=audio
 
-HOMEPAGE=  http://mega-nerd.com/SRC/
+SHARED_LIBS=   samplerate  3.0
+
+HOMEPAGE=  http://libsndfile.github.io/libsamplerate/
 MAINTAINER=Jan Stary 
 
 # 2-BSD license
 PERMIT_PACKAGE=Yes
 
-MASTER_SITES=  ${HOMEPAGE}
-
-WANTLIB=   FLAC c m ogg sndfile>=1 vorbis vorbisenc
+WANTLIB=   m
 
-LIB_DEPENDS=   audio/libsndfile
-
-CONFIGURE_STYLE=gnu
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
-   LDFLAGS="-L${LOCALBASE}/lib"
+AUTOCONF_VERSION=  2.69
+AUTOMAKE_VERSION=  1.16
+CONFIGURE_STYLE=autoreconf
 CONFIGURE_ARGS=--disable-cpu-clip \
-   --disable-fftw
-
-post-install:
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libsamplerate
-   ${INSTALL_DATA} ${WRKSRC}/doc/*.css \
-   ${PREFIX}/share/doc/libsamplerate
-   ${INSTALL_DATA} ${WRKSRC}/doc/*.png \
-   ${PREFIX}/share/doc/libsamplerate
-   ${INSTALL_DATA} ${WRKSRC}/doc/*.html \
-   ${PREFIX}/share/doc/libsamplerate
+   --disable-fftw \
+   --disable-sndfile
 
 .include 
Index: libsamplerate/distinfo
===
RCS file: /cvs/ports/audio/libsamplerate/distinfo,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 distinfo
--- libsamplerate/distinfo  7 Nov 2016 21:39:58 -   1.9
+++ libsamplerate/distinfo  11 Sep 2021 19:58:37 -
@@ -1,2 +1,2 @@
-SHA256 (libsamplerate-0.1.9.tar.gz) = 
Cn6xaOLyE1P7bYTaFS5FEhJvfcSMywvoBXjFZUE0RME=
-SIZE (libsamplerate-0.1.9.tar.gz) = 4336641
+SHA256 (libsamplerate-0.2.2.tar.gz) = 
FuiBSH8YQlDetPy2BDLXVWqxLLWMrqce8jlgrsbAQFo=
+SIZE (libsamplerate-0.2.2.tar.gz) = 3954784
Index: libsamplerate/patches/patch-tests_util_c
===
RCS file: libsamplerate/patches/patch-tests_util_c
diff -N libsamplerate/patches/patch-tests_util_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ libsamplerate/patches/patch-tests_util_c11 Sep 2021 19:58:37 -
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: tests/util.c
+--- tests/util.c.orig
 tests/util.c
+@@ -175,7 +175,7 @@ get_cpu_name (void)
+   file = popen ("/usr/sbin/system_profiler -detailLevel full 
SPHardwareDataType", "r") ;
+   search = "Processor Name" ;
+   is_pipe = 1 ;
+-#elif defined (__FreeBSD__)
++#elif defined (__FreeBSD__) || defined 

Re: UPDATE: libsamplerate 0.2.1

2021-09-04 Thread Brad Smith
On Fri, Sep 03, 2021 at 10:51:24PM -0400, Brad Smith wrote:
> Here is an update to libsamplerate 0.2.1.
> 
> Version 0.2.1 (2021-01-23)
>   * Fix incorrect passing of -version-info to libtool, causing a
> regression on versioned file name of the shared library (#140).
>   * Fix time resolution on GNU/Hurd for throughput_test
>   * Update AUTHORS and release manager details
> 
> Version 0.2.0 (2021-01-21)
>   * API:
> * Add `src_clone()` function to clone a SRC_STATE* handle
>   * Cleanup Autotools build system.
>   * Require C99 compiler
>   * Move `sndfile-resample` to sndfile-tools package
>   * Add missing `src_get_channels`() export to windows def file
>   * Fix macOS compile errors and modernize audio api on that platform
>   * Add Octave scripts to generate filter coefficients
>   * Fix two potential undefined behaviours
>   * Fix a buffer out-of-bounds read error in src/src_sinc.c
>   * Improve multichan_throughput_test
>   * Replace buggy implementationg of Duffs device by regular loop
>   * CMake:
> * Fix CMake generated shared library ABI compliance with Autotools build 
>   * Documentation:
> * Move site to new URL: http://libsndfile.github.io/libsamplerate/
> * Convert documentation pages from HTML to Markdown
> * Use GitHub's Jekyll static site generator to generate static HTML pages
>   for site

An updated diff with the missing dependency in frotz.


Index: audio/libsamplerate/Makefile
===
RCS file: /cvs/ports/audio/libsamplerate/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- audio/libsamplerate/Makefile12 Jul 2019 20:43:35 -  1.23
+++ audio/libsamplerate/Makefile4 Sep 2021 18:34:51 -
@@ -2,35 +2,26 @@
 
 COMMENT=   audio sample rate conversion library
 
-DISTNAME=  libsamplerate-0.1.9
-SHARED_LIBS=   samplerate  2.1
+GH_ACCOUNT=libsndfile
+GH_PROJECT=libsamplerate
+GH_TAGNAME=0.2.1
 CATEGORIES=audio
 
-HOMEPAGE=  http://mega-nerd.com/SRC/
+SHARED_LIBS=   samplerate  3.0
+
+HOMEPAGE=  https://github.com/libsndfile/libsamplerate/
 MAINTAINER=Jan Stary 
 
 # 2-BSD license
 PERMIT_PACKAGE=Yes
 
-MASTER_SITES=  ${HOMEPAGE}
-
-WANTLIB=   FLAC c m ogg sndfile>=1 vorbis vorbisenc
+WANTLIB=   m
 
-LIB_DEPENDS=   audio/libsndfile
-
-CONFIGURE_STYLE=gnu
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
-   LDFLAGS="-L${LOCALBASE}/lib"
+AUTOCONF_VERSION=  2.69
+AUTOMAKE_VERSION=  1.16
+CONFIGURE_STYLE=autoreconf
 CONFIGURE_ARGS=--disable-cpu-clip \
-   --disable-fftw
-
-post-install:
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libsamplerate
-   ${INSTALL_DATA} ${WRKSRC}/doc/*.css \
-   ${PREFIX}/share/doc/libsamplerate
-   ${INSTALL_DATA} ${WRKSRC}/doc/*.png \
-   ${PREFIX}/share/doc/libsamplerate
-   ${INSTALL_DATA} ${WRKSRC}/doc/*.html \
-   ${PREFIX}/share/doc/libsamplerate
+   --disable-fftw \
+   --disable-sndfile
 
 .include 
Index: audio/libsamplerate/distinfo
===
RCS file: /cvs/ports/audio/libsamplerate/distinfo,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 distinfo
--- audio/libsamplerate/distinfo7 Nov 2016 21:39:58 -   1.9
+++ audio/libsamplerate/distinfo4 Sep 2021 18:34:51 -
@@ -1,2 +1,2 @@
-SHA256 (libsamplerate-0.1.9.tar.gz) = 
Cn6xaOLyE1P7bYTaFS5FEhJvfcSMywvoBXjFZUE0RME=
-SIZE (libsamplerate-0.1.9.tar.gz) = 4336641
+SHA256 (libsamplerate-0.2.1.tar.gz) = 
wo3J/Vh/JQEU01qrGA5BVRk143yE52QcMdIlzaXrX6s=
+SIZE (libsamplerate-0.2.1.tar.gz) = 3954552
Index: audio/libsamplerate/patches/patch-tests_util_c
===
RCS file: audio/libsamplerate/patches/patch-tests_util_c
diff -N audio/libsamplerate/patches/patch-tests_util_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ audio/libsamplerate/patches/patch-tests_util_c  4 Sep 2021 18:34:51 
-
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: tests/util.c
+--- tests/util.c.orig
 tests/util.c
+@@ -175,7 +175,7 @@ get_cpu_name (void)
+   file = popen ("/usr/sbin/system_profiler -detailLevel full 
SPHardwareDataType", "r") ;
+   search = "Processor Name" ;
+   is_pipe = 1 ;
+-#elif defined (__FreeBSD__)
++#elif defined (__FreeBSD__) || defined (__OpenBSD__)
+   file = popen ("sysctl -a", "r") ;
+   search = "hw.model" ;
+   is_pipe = 1 ;
+@@ -188,7 +188,7 @@ get_cpu_name (void)
+   return name;
+ #endif
+ 
+-#if defined (__linux__) || defined (__APPLE__) || defined (__FreeBSD__)
++#if defined (__linux__) || defined (__APPLE__) || defined (__FreeBSD__) || 
defined (__OpenBSD__)
+   if (search == NULL)
+   {   printf ("Error : search is NULL in function %s.\n", __func__) ;
+   return name ;
Index: audio/libsamplerate/pkg/PLIST

Re: UPDATE: libsamplerate 0.1.8

2013-11-07 Thread Jan Stary
On Nov 07 02:08:38, b...@comstyle.com wrote:
 On 04/10/13 12:52 AM, Brad Smith wrote:
 Here is an update to libsamplerate 0.1.8.
 
 OK?
 
 ping.

This diff does not apply to current audio/libsamplerate for me ...


 Index: Makefile
 ===
 RCS file: /home/cvs/ports/audio/libsamplerate/Makefile,v
 retrieving revision 1.18
 diff -u -p -r1.18 Makefile
 --- Makefile 21 Mar 2013 08:45:12 -  1.18
 +++ Makefile 4 Oct 2013 04:36:24 -
 @@ -2,8 +2,7 @@
 
   COMMENT=   audio sample rate conversion library
 
 -DISTNAME=   libsamplerate-0.1.7
 -REVISION=   1
 +DISTNAME=   libsamplerate-0.1.8
   SHARED_LIBS=   samplerate  2.0 # .1.3
   CATEGORIES=audio
 
 @@ -15,28 +14,24 @@ PERMIT_PACKAGE_CDROM=Yes
 
   MASTER_SITES=  ${HOMEPAGE}
 
 -WANTLIB=c m sndfile=1 FLAC ogg vorbis vorbisenc
 +WANTLIB=FLAC c m ogg sndfile=1 vorbis vorbisenc
 
   LIB_DEPENDS=   audio/libsndfile
 
 -MAKE_FLAGS= CFLAGS=${CFLAGS}
 -
   CONFIGURE_STYLE=gnu
   CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \
  LDFLAGS=-L${LOCALBASE}/lib
   CONFIGURE_ARGS=${CONFIGURE_SHARED} \
 ---disable-gcc-opt \
  --disable-cpu-clip \
 ---disable-gcc-pipe \
  --disable-fftw
 
   post-install:
  ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libsamplerate
  ${INSTALL_DATA} ${WRKSRC}/doc/*.css \
 -${PREFIX}/share/doc/libsamplerate
 +${PREFIX}/share/doc/libsamplerate
  ${INSTALL_DATA} ${WRKSRC}/doc/*.png \
 -${PREFIX}/share/doc/libsamplerate
 +${PREFIX}/share/doc/libsamplerate
  ${INSTALL_DATA} ${WRKSRC}/doc/*.html \
 -${PREFIX}/share/doc/libsamplerate
 +${PREFIX}/share/doc/libsamplerate
 
   .include bsd.port.mk
 Index: distinfo
 ===
 RCS file: /home/cvs/ports/audio/libsamplerate/distinfo,v
 retrieving revision 1.7
 diff -u -p -r1.7 distinfo
 --- distinfo 26 Oct 2010 08:25:26 -  1.7
 +++ distinfo 5 Apr 2013 23:58:17 -
 @@ -1,5 +1,2 @@
 -MD5 (libsamplerate-0.1.7.tar.gz) = ZzGoHLDGIsSDsowNf5CGfQ==
 -RMD160 (libsamplerate-0.1.7.tar.gz) = oA8SVxCY/WxQqLn4hnzcw/NsH2A=
 -SHA1 (libsamplerate-0.1.7.tar.gz) = 8/gD7F/q5aP9sPo5Nyd2aehUOG4=
 -SHA256 (libsamplerate-0.1.7.tar.gz) = 
 eO1dn/G/FixKB49qPnQypTfdLyLcWIcrCB+wEVYCf8w=
 -SIZE (libsamplerate-0.1.7.tar.gz) = 4340619
 +SHA256 (libsamplerate-0.1.8.tar.gz) = 
 k7VL30bV5tI1S3A0OV/jKcIiqWZ5DeNFIHAruWQvHAY=
 +SIZE (libsamplerate-0.1.8.tar.gz) = 4303330
 Index: pkg/PFRAG.shared
 ===
 RCS file: pkg/PFRAG.shared
 diff -N pkg/PFRAG.shared
 --- pkg/PFRAG.shared 23 Dec 2005 15:29:08 -  1.2
 +++ /dev/null1 Jan 1970 00:00:00 -
 @@ -1,2 +0,0 @@
 -@comment $OpenBSD: PFRAG.shared,v 1.2 2005/12/23 15:29:08 espie Exp $
 -@lib lib/libsamplerate.so.${LIBsamplerate_VERSION}
 Index: pkg/PLIST
 ===
 RCS file: /home/cvs/ports/audio/libsamplerate/pkg/PLIST,v
 retrieving revision 1.3
 diff -u -p -r1.3 PLIST
 --- pkg/PLIST3 Jul 2008 08:30:01 -   1.3
 +++ pkg/PLIST4 Oct 2013 04:42:12 -
 @@ -1,9 +1,9 @@
   @comment $OpenBSD: PLIST,v 1.3 2008/07/03 08:30:01 ajacoutot Exp $
 -%%SHARED%%
   @bin bin/sndfile-resample
   include/samplerate.h
   lib/libsamplerate.a
   lib/libsamplerate.la
 +@lib lib/libsamplerate.so.${LIBsamplerate_VERSION}
   lib/pkgconfig/
   lib/pkgconfig/samplerate.pc
   share/doc/libsamplerate/
 @@ -22,3 +22,20 @@ share/doc/libsamplerate/license.html
   share/doc/libsamplerate/lists.html
   share/doc/libsamplerate/quality.html
   share/doc/libsamplerate/win32.html
 +share/doc/libsamplerate0-dev/
 +share/doc/libsamplerate0-dev/html/
 +share/doc/libsamplerate0-dev/html/SRC.css
 +share/doc/libsamplerate0-dev/html/SRC.png
 +share/doc/libsamplerate0-dev/html/api.html
 +share/doc/libsamplerate0-dev/html/api_callback.html
 +share/doc/libsamplerate0-dev/html/api_full.html
 +share/doc/libsamplerate0-dev/html/api_misc.html
 +share/doc/libsamplerate0-dev/html/api_simple.html
 +share/doc/libsamplerate0-dev/html/download.html
 +share/doc/libsamplerate0-dev/html/faq.html
 +share/doc/libsamplerate0-dev/html/history.html
 +share/doc/libsamplerate0-dev/html/index.html
 +share/doc/libsamplerate0-dev/html/license.html
 +share/doc/libsamplerate0-dev/html/lists.html
 +share/doc/libsamplerate0-dev/html/quality.html
 +share/doc/libsamplerate0-dev/html/win32.html
 
 
 
 -- 
 This message has been scanned for viruses and
 dangerous content by MailScanner, and is
 believed to be clean.



Re: UPDATE: libsamplerate 0.1.8

2013-11-06 Thread Brad Smith

On 04/10/13 12:52 AM, Brad Smith wrote:

Here is an update to libsamplerate 0.1.8.

OK?


ping.


Index: Makefile
===
RCS file: /home/cvs/ports/audio/libsamplerate/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile21 Mar 2013 08:45:12 -  1.18
+++ Makefile4 Oct 2013 04:36:24 -
@@ -2,8 +2,7 @@

  COMMENT=  audio sample rate conversion library

-DISTNAME=  libsamplerate-0.1.7
-REVISION=  1
+DISTNAME=  libsamplerate-0.1.8
  SHARED_LIBS=  samplerate  2.0 # .1.3
  CATEGORIES=   audio

@@ -15,28 +14,24 @@ PERMIT_PACKAGE_CDROM=   Yes

  MASTER_SITES= ${HOMEPAGE}

-WANTLIB=   c m sndfile=1 FLAC ogg vorbis vorbisenc
+WANTLIB=   FLAC c m ogg sndfile=1 vorbis vorbisenc

  LIB_DEPENDS=  audio/libsndfile

-MAKE_FLAGS=CFLAGS=${CFLAGS}
-
  CONFIGURE_STYLE=gnu
  CONFIGURE_ENV=CPPFLAGS=-I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib
  CONFIGURE_ARGS=   ${CONFIGURE_SHARED} \
-   --disable-gcc-opt \
--disable-cpu-clip \
-   --disable-gcc-pipe \
--disable-fftw

  post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libsamplerate
${INSTALL_DATA} ${WRKSRC}/doc/*.css \
-   ${PREFIX}/share/doc/libsamplerate
+   ${PREFIX}/share/doc/libsamplerate
${INSTALL_DATA} ${WRKSRC}/doc/*.png \
-   ${PREFIX}/share/doc/libsamplerate
+   ${PREFIX}/share/doc/libsamplerate
${INSTALL_DATA} ${WRKSRC}/doc/*.html \
-   ${PREFIX}/share/doc/libsamplerate
+   ${PREFIX}/share/doc/libsamplerate

  .include bsd.port.mk
Index: distinfo
===
RCS file: /home/cvs/ports/audio/libsamplerate/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo26 Oct 2010 08:25:26 -  1.7
+++ distinfo5 Apr 2013 23:58:17 -
@@ -1,5 +1,2 @@
-MD5 (libsamplerate-0.1.7.tar.gz) = ZzGoHLDGIsSDsowNf5CGfQ==
-RMD160 (libsamplerate-0.1.7.tar.gz) = oA8SVxCY/WxQqLn4hnzcw/NsH2A=
-SHA1 (libsamplerate-0.1.7.tar.gz) = 8/gD7F/q5aP9sPo5Nyd2aehUOG4=
-SHA256 (libsamplerate-0.1.7.tar.gz) = 
eO1dn/G/FixKB49qPnQypTfdLyLcWIcrCB+wEVYCf8w=
-SIZE (libsamplerate-0.1.7.tar.gz) = 4340619
+SHA256 (libsamplerate-0.1.8.tar.gz) = 
k7VL30bV5tI1S3A0OV/jKcIiqWZ5DeNFIHAruWQvHAY=
+SIZE (libsamplerate-0.1.8.tar.gz) = 4303330
Index: pkg/PFRAG.shared
===
RCS file: pkg/PFRAG.shared
diff -N pkg/PFRAG.shared
--- pkg/PFRAG.shared23 Dec 2005 15:29:08 -  1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.2 2005/12/23 15:29:08 espie Exp $
-@lib lib/libsamplerate.so.${LIBsamplerate_VERSION}
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/audio/libsamplerate/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   3 Jul 2008 08:30:01 -   1.3
+++ pkg/PLIST   4 Oct 2013 04:42:12 -
@@ -1,9 +1,9 @@
  @comment $OpenBSD: PLIST,v 1.3 2008/07/03 08:30:01 ajacoutot Exp $
-%%SHARED%%
  @bin bin/sndfile-resample
  include/samplerate.h
  lib/libsamplerate.a
  lib/libsamplerate.la
+@lib lib/libsamplerate.so.${LIBsamplerate_VERSION}
  lib/pkgconfig/
  lib/pkgconfig/samplerate.pc
  share/doc/libsamplerate/
@@ -22,3 +22,20 @@ share/doc/libsamplerate/license.html
  share/doc/libsamplerate/lists.html
  share/doc/libsamplerate/quality.html
  share/doc/libsamplerate/win32.html
+share/doc/libsamplerate0-dev/
+share/doc/libsamplerate0-dev/html/
+share/doc/libsamplerate0-dev/html/SRC.css
+share/doc/libsamplerate0-dev/html/SRC.png
+share/doc/libsamplerate0-dev/html/api.html
+share/doc/libsamplerate0-dev/html/api_callback.html
+share/doc/libsamplerate0-dev/html/api_full.html
+share/doc/libsamplerate0-dev/html/api_misc.html
+share/doc/libsamplerate0-dev/html/api_simple.html
+share/doc/libsamplerate0-dev/html/download.html
+share/doc/libsamplerate0-dev/html/faq.html
+share/doc/libsamplerate0-dev/html/history.html
+share/doc/libsamplerate0-dev/html/index.html
+share/doc/libsamplerate0-dev/html/license.html
+share/doc/libsamplerate0-dev/html/lists.html
+share/doc/libsamplerate0-dev/html/quality.html
+share/doc/libsamplerate0-dev/html/win32.html




--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.