pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/multimedia/mkvtoolnix



Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Mar 21 21:30:16 UTC 2022

Modified Files:
        pkgsrc/multimedia/mkvtoolnix: Makefile

Log Message:
mkvtoolnix: Try to fix build on various OS.

Not sure how this worked, the build system is incredibly opaque and tries to
build Windows-only files on at least NetBSD and SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.190 -r1.191 pkgsrc/multimedia/mkvtoolnix/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/mkvtoolnix/Makefile
diff -u pkgsrc/multimedia/mkvtoolnix/Makefile:1.190 pkgsrc/multimedia/mkvtoolnix/Makefile:1.191
--- pkgsrc/multimedia/mkvtoolnix/Makefile:1.190 Mon Mar 14 11:09:23 2022
+++ pkgsrc/multimedia/mkvtoolnix/Makefile       Mon Mar 21 21:30:16 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.190 2022/03/14 11:09:23 adam Exp $
+# $NetBSD: Makefile,v 1.191 2022/03/21 21:30:16 jperkin Exp $
 
 DISTNAME=      mkvtoolnix-66.0.0
 CATEGORIES=    multimedia
@@ -39,6 +39,14 @@ LDFLAGS.SunOS+=              -lintl
 
 INSTALL_ENV+=  SHELL=${SH:Q}
 
+.include "../../mk/bsd.prefs.mk"
+
+pre-build:
+       cd ${WRKSRC} && ${RM} src/common/*/windows.cpp
+.if ${OPSYS} != "Darwin"
+       cd ${WRKSRC} && ${RM} src/common/*/macos.cpp
+.endif
+
 do-build:
        cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${RAKE}
 



Home | Main Index | Thread Index | Old Index