Build and package info is available at https://gitlab.com/swills/freebsd-ports/pipelines/238738244

Comment 2 Daniel Engberg 2021-01-08 02:42:04 UTC

Created attachment 221373 [details]
Patch for zita-resampler

Import CMake build instead of hacking upstream Makefile
Add USE_LDCONFIG
Only apply SSE2 optimization on amd64 (old patch fails on arm64 for instance)

Sources:
https://github.com/jpcima/zita-resampler
https://github.com/libcheck/check

Compile tested on 13-CURRENT amd64 and arm64

No need to accept this if you don't like it but in case you do, feel free to upstream :-)

Comment 3 Daniel Engberg 2021-01-08 02:46:19 UTC

Created attachment 221374 [details]
Patch for zita-resampler v2

Fix cut 'n paste error

This is great! I like it.

Comment 5 Fernando Apesteguía 2021-01-08 17:02:47 UTC

^Triage: If there is a changelog or release notes URL available for this version, please add it to the URL field.

Q/A:  /tmp/252497/audio/zita-resampler/files/patch-CMakeLists.txt: patch was not generated using ``make makepatch''.  It is recommended to use ``make makepatch'' when you need to [re-]generate a patch to ensure proper patch format.

Thanks!

Comment 6 Daniel Engberg 2021-01-08 17:06:59 UTC

There's no file to generate a patch from and in that case make makepatch won't work as far as I can tell.

Comment 7 Fernando Apesteguía 2021-01-08 17:31:28 UTC

(In reply to daniel.engberg.lists from comment #6)

Apparently it does.

/tmp/252497/audio/zita-resampler$ portlint -AC
WARN: Makefile: for new port, make $FreeBSD$ tag in comment section empty, to make SVN happy.
WARN: /tmp/252497/audio/zita-resampler/files/patch-CMakeLists.txt: patch was not generated using ``make makepatch''.  It is recommended to use ``make makepatch'' when you need to [re-]generate a patch to ensure proper patch format.

/tmp/252497/audio/zita-resampler$ make patch

===>  License GPLv3+ accepted by the user
===>   zita-resampler-1.8.0 depends on file: /usr/local/sbin/pkg - found
===> Fetching all distfiles required by zita-resampler-1.8.0 for building
===>  Extracting for zita-resampler-1.8.0
=> SHA256 Checksum OK for zita-resampler-1.8.0.tar.bz2.
===>  Patching for zita-resampler-1.8.0
===>  Applying FreeBSD patches for zita-resampler-1.8.0

/tmp/252497/audio/zita-resampler$ make makepatch
Generated patch-CMakeLists.txt
The previous patches have been placed here:
/tmp/252497/audio/zita-resampler/work/.makepatch-tmp/archived-patches

/tmp/252497/audio/zita-resampler$ portlint -AC
WARN: Makefile: for new port, make $FreeBSD$ tag in comment section empty, to make SVN happy.

Now... I'm not completely sure about replacing the upstream Makefile with CMake. For one, it (obviously) pulls CMake in the dependencies list that is not super light to build. Also, what if we commit this and upstream does not accept the CMakeList.txt? Are we going to port all the things in the upstream Makefile to the CMakeList.txt when something changes?

Don't get me wrong, I think CMake is in general far superior than old GNU tools, but wouldn't it be better to send the patch upstream and wait and see if they adopt it?

Cheers

As resampler is not the only zita's project, I'm doubtful about upstreaming cmake for just one project.

Comment 9 Fernando Apesteguía 2021-01-09 22:38:40 UTC

(In reply to Goran Mekić from comment #8)
In that case I would stick to the original Makefile.

Created attachment 221515 [details]
Original patch using GNU make

Created attachment 221531 [details]
Original patch with SSE removed

Comment 12 Yuri Victorovich 2021-01-31 04:49:08 UTC

Committed, thanks!

Comment 13 commit-hook 2021-01-31 04:49:26 UTC

A commit references this bug:

Author: yuri
Date: Sun Jan 31 04:49:05 UTC 2021
New revision: 563461
URL: https://svnweb.freebsd.org/changeset/ports/563461

Log:
  audio/zita-resampler: Update 1.6.2 -> 1.8.0

  PR:		252497
  Submitted by:	meka@tilda.center (maintainer), fernape@

Changes:
  head/audio/zita-resampler/Makefile
  head/audio/zita-resampler/distinfo
  head/audio/zita-resampler/files/patch-CMakeLists.txt
  head/audio/zita-resampler/files/patch-apps_Makefile
  head/audio/zita-resampler/files/patch-source_Makefile
  head/audio/zita-resampler/pkg-descr
  head/audio/zita-resampler/pkg-plist