On 14/02/2023 09:11, Takashi Yano via Cygwin-apps wrote:
On Mon, 13 Feb 2023 18:28:37 +0000
Jon Turney wrote:
On 06/02/2023 13:53, Takashi Yano via Cygwin-apps wrote:
if [ ${all_codecs} = "yes" ]
then
cat <<_EOF_ > ffmpeg-wchar.patch
--- origsrc/ffmpeg-5.1.2/libavcodec/mf_utils.h 2022-07-23 02:58:39.000000000
+0900
+++ src/ffmpeg-5.1.2/libavcodec/mf_utils.h 2023-01-26 12:33:12.745550400
+0900
@@ -29,6 +29,7 @@
// mf*.h headers below indirectly include strmif.h.)
#include <icodecapi.h>
#else
+#include <wchar.h>
#define NO_DSHOW_STRSAFE
#include <dshow.h>
// Older versions of mingw-w64 need codecapi.h explicitly included, while
newer
_EOF_
PATCH_URI+=" ffmpeg-wchar.patch"
el
This seems an odd way to write this. If possible, just apply the patch
unconditionally (I assume it doesn't break all_codec=no builds), and
treat it normally (i.e. keep it next to the cygport, list it in
PATCH_URI, so it gets placed into the source package.)
If it's really necessary to only apply the patch in the all_codec=yes
case, use src_patch_apply_hook [1].
[1]
https://cygwin.github.io/cygport/src_prep_cygpart.html#src_patch_apply_hook
Otherwise, looks good.
Patching conditionally is necessary because the target file
is excluded from free-source tarball (ffmpeg_free_sources)
if all_codecs != "yes".
Ah, I see.
I revised the cygport file which uses src_patch_apply_hook()
as you recommended.
Looks good.
