xjadeo: Prototype NetBSD support in the build machinery

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: xjadeo: Prototype NetBSD support in the build machinery
From: Kamil Rytarowski <n54%gmx.com@localhost>
Date: Sat, 18 Jun 2016 23:43:44 +0000
Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sun Jun 19 01:43:44 2016 +0200
Changeset:	28ba29a309ab5af68b3ef3b8ab79dc9e52d2bc6d

Modified Files:
	xjadeo/Makefile
	xjadeo/distinfo
	xjadeo/patches/patch-configure.ac
Added Files:
	xjadeo/patches/patch-src_xjadeo_Makefile.am

Log Message:
xjadeo: Prototype NetBSD support in the build machinery

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=28ba29a309ab5af68b3ef3b8ab79dc9e52d2bc6d

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

diffstat:
 xjadeo/Makefile                             |  3 +-
 xjadeo/distinfo                             |  3 +-
 xjadeo/patches/patch-configure.ac           | 86 ++++++++++++++++++++++++++++-
 xjadeo/patches/patch-src_xjadeo_Makefile.am | 15 +++++
 4 files changed, 102 insertions(+), 5 deletions(-)

diffs:
diff --git a/xjadeo/Makefile b/xjadeo/Makefile
index cdfd9f3..2506e59 100644
--- a/xjadeo/Makefile
+++ b/xjadeo/Makefile
@@ -12,12 +12,13 @@ LICENSE=	gnu-gpl-v2
 
 USE_LANGUAGES=	c c++
 
-USE_TOOLS=	automake aclocal autoheader autoconf
+USE_TOOLS=	automake aclocal autoheader autoconf pkg-config
 
 GNU_CONFIGURE=	yes
 
 pre-configure:
 	${RUN} cd ${WRKSRC} && ${PKGSRC_SETENV} ${CONFIGURE_ENV} ${CONFIG_SHELL} ./autogen.sh
 
+.include "../../multimedia/ffmpeg3/buildlink3.mk"
 .include "../../audio/jack/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/xjadeo/distinfo b/xjadeo/distinfo
index f355447..83be308 100644
--- a/xjadeo/distinfo
+++ b/xjadeo/distinfo
@@ -4,4 +4,5 @@ SHA1 (xjadeo-0.8.5.tar.gz) = ed72634312e2d1d5b13a4eeef444895c3f3abfc5
 RMD160 (xjadeo-0.8.5.tar.gz) = 7794ace9bb5b84b4b4fa603347c48d482b95541d
 SHA512 (xjadeo-0.8.5.tar.gz) = 124644df6b18518fd7cfabea47cf4b466d41f771891df6805c95a63f18ab9b71ac1568e1d0cdb7df5361f19e742e850fc57ea1239547c00484c15f1a85aa2b18
 Size (xjadeo-0.8.5.tar.gz) = 996023 bytes
-SHA1 (patch-configure.ac) = cfa8d89d0e8f6e0977e725642108ae3d9c5b47f5
+SHA1 (patch-configure.ac) = 59dec1d2b0d1922ef8cde791d7c8ac1f349eaa82
+SHA1 (patch-src_xjadeo_Makefile.am) = 7b1d2374ec71a6f64698bc5ffb35db1e6cdee829
diff --git a/xjadeo/patches/patch-configure.ac b/xjadeo/patches/patch-configure.ac
index a89b457..6d4e930 100644
--- a/xjadeo/patches/patch-configure.ac
+++ b/xjadeo/patches/patch-configure.ac
@@ -4,7 +4,45 @@ Fix shell portability problem.
 
 --- configure.ac.orig	2015-11-25 14:17:19.000000000 +0000
 +++ configure.ac
-@@ -89,7 +89,7 @@ case $target_os in
+@@ -51,6 +51,7 @@ case $target_os in
+ 		HAVE_GL=1
+ 		AM_CONDITIONAL([TARGET_OSX], true)
+ 		AM_CONDITIONAL([TARGET_LINUX], false)
++		AM_CONDITIONAL([TARGET_NETBSD], false)
+ 		AM_CONDITIONAL([TARGET_WIN32], false)
+ 		dnl 2006/11/13 : 32 bit RGBA is known not to work on OSX ffmpeg+imlib2
+ 		dnl IMLIB2RGBA
+@@ -63,9 +64,21 @@ case $target_os in
+ 		AC_DEFINE([IMLIB2RGBA], [], [use native RGB32 ffmpeg -> imlib.])
+ 		AM_CONDITIONAL([TARGET_OSX], false)
+ 		AM_CONDITIONAL([TARGET_LINUX], true)
++		AM_CONDITIONAL([TARGET_NETBSD], false)
+ 		AM_CONDITIONAL([TARGET_WIN32], false)
+ 		LIBS="$LIBS -L/usr/X11R6/lib"
+ 		;;
++	*netbsd*)
++		AC_DEFINE([PLATFORM_NETBSD], [], [NetBSD version])
++		PLATFORM_NETBSD=1
++		AC_MSG_NOTICE([TARGET: NETBSD])
++		PM_OS="netbsd";
++		AC_DEFINE([IMLIB2RGBA], [], [use native RGB32 ffmpeg -> imlib.])
++		AM_CONDITIONAL([TARGET_OSX], false)
++		AM_CONDITIONAL([TARGET_LINUX], false)
++		AM_CONDITIONAL([TARGET_NETBSD], true)
++		AM_CONDITIONAL([TARGET_WIN32], false)
++		;;
+ 	*mingw32*|*win*)
+ 		AC_MSG_NOTICE([TARGET: WINDOWS])
+ 		PM_OS=win
+@@ -78,6 +91,7 @@ case $target_os in
+ 		HAVE_GL=1
+ 		AM_CONDITIONAL([TARGET_OSX], false)
+ 		AM_CONDITIONAL([TARGET_LINUX], false)
++		AM_CONDITIONAL([TARGET_NETBSD], true)
+ 		AM_CONDITIONAL([TARGET_WIN32], true)
+ 		AC_CHECK_TOOL(WINDRES, windres, false)
+ 		if test "$WINDRES" = "false"; then
+@@ -89,7 +103,7 @@ case $target_os in
  		;;
  esac
  
@@ -13,7 +51,32 @@ Fix shell portability problem.
  	AM_CONDITIONAL([EMBED_FONT], true)
  else
  	AM_CONDITIONAL([EMBED_FONT], false)
-@@ -170,7 +170,7 @@ if test "x$enable_timescale" != "xyes"; 
+@@ -119,18 +133,18 @@ AC_CHECK_HEADERS(time.h string.h)
+ dnl Checks for libraries.
+ 
+ dnl video output
+-AH_TEMPLATE([HAVE_GL], [Define to enable openGL (win,osx,linux)])
+-AH_TEMPLATE([HAVE_SDL], [Define as 1 if  you have the SDL toolkit (win,osx,linux)])
+-AH_TEMPLATE([HAVE_LIBXV], [Video Output: XVideo support (linux)])
+-AH_TEMPLATE([HAVE_IMLIB2], [Video Output: plain old imlib2 (linux)])
++AH_TEMPLATE([HAVE_GL], [Define to enable openGL (linux,netbsd,osx,win)])
++AH_TEMPLATE([HAVE_SDL], [Define as 1 if  you have the SDL toolkit (linux,netbsd,osx,win)])
++AH_TEMPLATE([HAVE_LIBXV], [Video Output: XVideo support (linux,netbsd)])
++AH_TEMPLATE([HAVE_IMLIB2], [Video Output: plain old imlib2 (linux,netbsd)])
+ AH_TEMPLATE([IMLIB2RGBA], [Define for RGBA32 imlib2 (not RGB24)])
+ 
+ dnl MTC sync
+ AH_TEMPLATE([HAVE_MIDI], [general MIDI (MTC) support])
+ AH_TEMPLATE([HAVE_JACKMIDI], [Define as 1 to enable JACK-MIDI])
+ AH_TEMPLATE([HAVE_PORTMIDI], [Define as 1 to enable the portmidi driver (win,osx)])
+-AH_TEMPLATE([ALSA_SEQ_MIDI], [Define as 1 to enable ALSA sequencer (linux)])
+-AH_TEMPLATE([ALSA_RAW_MIDI], [Define as 1 to enable ALSA-raw midi (linux)])
++AH_TEMPLATE([ALSA_SEQ_MIDI], [Define as 1 to enable ALSA sequencer (linux,netbsd)])
++AH_TEMPLATE([ALSA_RAW_MIDI], [Define as 1 to enable ALSA-raw midi (linux,netbsd)])
+ 
+ dnl LTC sync
+ AH_TEMPLATE([HAVE_LTC], [Define as 1 if you have libltc - http://github.com/x42/libltc ])
+@@ -170,7 +184,7 @@ if test "x$enable_timescale" != "xyes"; 
  	AC_DEFINE(TIMEMAP)
  fi
  
@@ -22,7 +85,7 @@ Fix shell portability problem.
  	AC_DEFINE(CROPIMG)
  fi
  
-@@ -462,7 +462,7 @@ else
+@@ -462,7 +476,7 @@ else
  	else
  		OSDREPORT="${OSDREPORT}-"
  	fi
@@ -31,3 +94,20 @@ Fix shell portability problem.
  		OSDREPORT="${OSDREPORT}
     - embed font:     yes"
  	 else
+@@ -531,14 +545,14 @@ AC_MSG_NOTICE([
+ ])
+ fi
+ 
+-if test -n "$PLATFORM_LINUX" -a -n "$HAVE_PORTMIDI"; then
++if test -n "$PLATFORM_LINUX$PLATFORM_NETBSD" -a -n "$HAVE_PORTMIDI"; then
+ AC_MSG_NOTICE([
+  PortMidi is intended for non Un*x Platforms only.
+  On Linux, please use JACK, ALSA-seq or ALSA-raw.
+ ])
+ fi
+ 
+-if test -n "$PLATFORM_LINUX$PLATFORM_OSX" -a -n "$HAVE_QT4"; then
++if test -n "$PLATFORM_LINUX$PLATFORM_OSX$PLATFORM_NETBSD" -a -n "$HAVE_QT4"; then
+ AC_MSG_WARN([
+  qjadeo is deprecated an not intended to be used.
+  It will be removed in future releases.
diff --git a/xjadeo/patches/patch-src_xjadeo_Makefile.am b/xjadeo/patches/patch-src_xjadeo_Makefile.am
new file mode 100644
index 0000000..95e42bd
--- /dev/null
+++ b/xjadeo/patches/patch-src_xjadeo_Makefile.am
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- src/xjadeo/Makefile.am.orig	2015-11-25 14:17:19.000000000 +0000
++++ src/xjadeo/Makefile.am
+@@ -30,6 +30,10 @@ if TARGET_LINUX
+ xjadeo_SOURCES+=display_glx.c
+ xjadeo_LDADD+=@JACK_LIBS@
+ endif
++if TARGET_NETBSD
++xjadeo_SOURCES+=display_glx.c
++xjadeo_LDADD+=@JACK_LIBS@
++endif
+ if TARGET_WIN32
+ xjadeo_SOURCES+=display_gl_win.c windows.rc
+ xjadeo_CFLAGS+=-DUSE_WEAK_JACK
Prev by Date: harvid: Drop, imported to pkgsrc
Next by Date: xjadeo: Backport getmntent() patches from sysutils/fam
Previous by Thread: harvid: Drop, imported to pkgsrc
Next by Thread: xjadeo: Backport getmntent() patches from sysutils/fam
Indexes:
Home | Main Index | Thread Index | Old Index