pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
xjadeo: Remove, imported into pkgsrc
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Sun Jun 19 11:18:19 2016 +0200
Changeset: e98178f013d62b0fbf0bde8bed3e11a765c6bee1
Removed Files:
xjadeo/DESCR
xjadeo/Makefile
xjadeo/PLIST
xjadeo/distinfo
xjadeo/patches/patch-configure.ac
xjadeo/patches/patch-src_xjadeo_Makefile.am
xjadeo/patches/patch-src_xjadeo_libsofd.c
Log Message:
xjadeo: Remove, imported into pkgsrc
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e98178f013d62b0fbf0bde8bed3e11a765c6bee1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
xjadeo/DESCR | 1 -
xjadeo/Makefile | 24 ----
xjadeo/PLIST | 6 -
xjadeo/distinfo | 9 --
xjadeo/patches/patch-configure.ac | 113 ------------------
xjadeo/patches/patch-src_xjadeo_Makefile.am | 17 ---
xjadeo/patches/patch-src_xjadeo_libsofd.c | 176 ----------------------------
7 files changed, 346 deletions(-)
diffs:
diff --git a/xjadeo/DESCR b/xjadeo/DESCR
deleted file mode 100644
index 23fd8d9..0000000
--- a/xjadeo/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-xjadeo is a simple video player that gets sync from jack.
diff --git a/xjadeo/Makefile b/xjadeo/Makefile
deleted file mode 100644
index 44328f9..0000000
--- a/xjadeo/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD$
-
-DISTNAME= xjadeo-0.8.5
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_GITHUB:=x42/}
-GITHUB_TAG= v${PKGVERSION_NOREV}
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://xjadeo.sourceforge.net/
-COMMENT= X JAck viDEo mOnitor
-LICENSE= gnu-gpl-v2
-
-USE_LANGUAGES= c c++
-
-USE_TOOLS+= automake aclocal autoheader autoconf pkg-config
-
-GNU_CONFIGURE= yes
-
-pre-configure:
- ${RUN} cd ${WRKSRC} && ./autogen.sh
-
-.include "../../multimedia/ffmpeg3/buildlink3.mk"
-.include "../../audio/jack/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/xjadeo/PLIST b/xjadeo/PLIST
deleted file mode 100644
index 7209748..0000000
--- a/xjadeo/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD$
-bin/xjadeo
-bin/xjremote
-man/man1/xjadeo.1
-man/man1/xjremote.1
-share/xjadeo/ArdourMono.ttf
diff --git a/xjadeo/distinfo b/xjadeo/distinfo
deleted file mode 100644
index 59ebf20..0000000
--- a/xjadeo/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD$
-
-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) = 59dec1d2b0d1922ef8cde791d7c8ac1f349eaa82
-SHA1 (patch-src_xjadeo_Makefile.am) = 42f6a6af900ef495430cf52dea74f83c7c6ddae6
-SHA1 (patch-src_xjadeo_libsofd.c) = 4af37e40a9e2dacae8a9983228a98ed58e1a612f
diff --git a/xjadeo/patches/patch-configure.ac b/xjadeo/patches/patch-configure.ac
deleted file mode 100644
index 6d4e930..0000000
--- a/xjadeo/patches/patch-configure.ac
+++ /dev/null
@@ -1,113 +0,0 @@
-$NetBSD$
-
-Fix shell portability problem.
-
---- configure.ac.orig 2015-11-25 14:17:19.000000000 +0000
-+++ configure.ac
-@@ -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
-
--if test "x$enable_embed_font" == "xyes"; then
-+if test "x$enable_embed_font" = "xyes"; then
- AM_CONDITIONAL([EMBED_FONT], true)
- else
- AM_CONDITIONAL([EMBED_FONT], false)
-@@ -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
-
--if test "x$enable_framecrop" == "xyes"; then
-+if test "x$enable_framecrop" = "xyes"; then
- AC_DEFINE(CROPIMG)
- fi
-
-@@ -462,7 +476,7 @@ else
- else
- OSDREPORT="${OSDREPORT}-"
- fi
-- if test "x$enable_embed_font" == "xyes"; then
-+ if test "x$enable_embed_font" = "xyes"; then
- 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
deleted file mode 100644
index a685680..0000000
--- a/xjadeo/patches/patch-src_xjadeo_Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-Add NetBSD support.
-
---- 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
diff --git a/xjadeo/patches/patch-src_xjadeo_libsofd.c b/xjadeo/patches/patch-src_xjadeo_libsofd.c
deleted file mode 100644
index 41ee10a..0000000
--- a/xjadeo/patches/patch-src_xjadeo_libsofd.c
+++ /dev/null
@@ -1,176 +0,0 @@
-$NetBSD$
-
-Add NetBSD support.
-
-Backport getmntent() from sysutils/fam.
-
---- src/xjadeo/libsofd.c.orig 2015-11-25 14:17:19.000000000 +0000
-+++ src/xjadeo/libsofd.c
-@@ -334,8 +334,167 @@ const char *x_fib_recent_file(const char
-
- #ifdef XFIB
- #if (defined HAVE_LIBXV || defined HAVE_IMLIB2 || (defined HAVE_GL && !defined PLATFORM_WINDOWS && !defined PLATFORM_OSX))
-+#if defined PLATFORM_LINUX
- #include <mntent.h>
-+#endif
- #include <dirent.h>
-+#if defined PLATFORM_NETBSD
-+#include <sys/types.h>
-+#include <sys/statvfs.h>
-+
-+#include <stdio.h>
-+
-+#define MOUNTED "dummy"
-+
-+#define MNTTYPE_NFS "nfs"
-+
-+struct mntent {
-+ char *mnt_fsname;
-+ char *mnt_dir;
-+ char *mnt_type;
-+ char *mnt_opts;
-+ int mnt_freq;
-+ int mnt_passno;
-+};
-+
-+#define setmntent(x,y) ((FILE *)0x1)
-+struct mntent *getmntent __P ((FILE *fp));
-+char *hasmntopt __P ((const struct mntent *mnt, const char *option));
-+#define endmntent(x) ((int)1)
-+
-+static int pos = -1;
-+static int mntsize = -1;
-+static struct mntent _mntent;
-+
-+char *
-+hasmntopt (const struct mntent *mnt, const char *option)
-+{
-+ int found;
-+ char *opt, *optbuf;
-+
-+ optbuf = strdup(mnt->mnt_opts);
-+ found = 0;
-+ for (opt = optbuf; (opt = strtok(opt, " ")) != NULL; opt = NULL) {
-+ if (!strcasecmp(opt, option)) {
-+ opt = opt - optbuf + mnt->mnt_opts;
-+ free (optbuf);
-+ return (opt);
-+ }
-+ }
-+ free (optbuf);
-+ return (NULL);
-+}
-+
-+static char *
-+catopt (char *s0, const char *s1)
-+{
-+ size_t i;
-+ char *cp;
-+
-+ if (s1 == NULL || *s1 == '\0')
-+ return s0;
-+ if (s0 && *s0) {
-+ i = strlen(s0) + strlen(s1) + 1 + 1;
-+ if ((cp = (char *)malloc(i)) == NULL)
-+ return (NULL);
-+ (void)snprintf(cp, i, "%s %s", s0, s1);
-+ } else
-+ cp = strdup(s1);
-+
-+ if (s0)
-+ free(s0);
-+ return (cp);
-+}
-+
-+static char *
-+flags2opts (int flags)
-+{
-+ char *res;
-+ res = NULL;
-+ res = catopt(res, (flags & MNT_RDONLY) ? "ro" : "rw");
-+ if (flags & MNT_SYNCHRONOUS) res = catopt(res, "sync");
-+ if (flags & MNT_NOEXEC) res = catopt(res, "noexec");
-+ if (flags & MNT_NOSUID) res = catopt(res, "nosuid");
-+#ifdef MNT_NODEV
-+ if (flags & MNT_NODEV) res = catopt(res, "nodev");
-+#endif
-+#ifdef MNT_UNION
-+ if (flags & MNT_UNION) res = catopt(res, "union");
-+#endif
-+ if (flags & MNT_ASYNC) res = catopt(res, "async");
-+#ifdef MNT_NOATIME
-+ if (flags & MNT_NOATIME) res = catopt(res, "noatime");
-+#endif
-+#ifdef MNT_NOCLUSTERR
-+ if (flags & MNT_NOCLUSTERR) res = catopt(res, "noclusterr");
-+#endif
-+#ifdef MNT_NOCLUSTERW
-+ if (flags & MNT_NOCLUSTERW) res = catopt(res, "noclusterw");
-+#endif
-+#ifdef MNT_NOSYMFOLLOW
-+ if (flags & MNT_NOSYMFOLLOW) res = catopt(res, "nosymfollow");
-+#endif
-+#ifdef MNT_SUIDDIR
-+ if (flags & MNT_SUIDDIR) res = catopt(res, "suiddir");
-+#endif
-+#ifdef MNT_NOCOREDUMP
-+ if (flags & MNT_NOCOREDUMP) res = catopt(res, "nocoredump");
-+#endif
-+#ifdef MNT_IGNORE
-+ if (flags & MNT_IGNORE) res = catopt(res, "hidden");
-+#endif
-+#ifdef MNT_SYMPERM
-+ if (flags & MNT_SYMPERM) res = catopt(res, "symperm");
-+#endif
-+#ifdef MNT_NODEVMTIME
-+ if (flags & MNT_NODEVMTIME) res = catopt(res, "nodevmtime");
-+#endif
-+#ifdef MNT_SOFTDEP
-+ if (flags & MNT_SOFTDEP) res = catopt(res, "softdep");
-+#endif
-+
-+ return res;
-+}
-+
-+static struct mntent *
-+statfs_to_mntent (struct statvfs *mntbuf)
-+{
-+ static char opts_buf[40], *tmp;
-+
-+ _mntent.mnt_fsname = mntbuf->f_mntfromname;
-+ _mntent.mnt_dir = mntbuf->f_mntonname;
-+ _mntent.mnt_type = mntbuf->f_fstypename;
-+ tmp = flags2opts (mntbuf->f_flag);
-+
-+ if (tmp) {
-+ opts_buf[sizeof(opts_buf)-1] = '\0';
-+ strncpy (opts_buf, tmp, sizeof(opts_buf)-1);
-+ free (tmp);
-+ } else {
-+ *opts_buf = '\0';
-+ }
-+ _mntent.mnt_opts = opts_buf;
-+ _mntent.mnt_freq = _mntent.mnt_passno = 0;
-+ return (&_mntent);
-+}
-+
-+struct mntent *
-+getmntent (FILE *fp)
-+{
-+ static struct statvfs *mntbuf;
-+
-+ if (pos == -1 || mntsize == -1)
-+ mntsize = getmntinfo (&mntbuf, MNT_NOWAIT);
-+
-+ ++pos;
-+ if (pos == mntsize) {
-+ pos = mntsize = -1;
-+ return (NULL);
-+ }
-+
-+ return (statfs_to_mntent (&mntbuf[pos]));
-+}
-+#endif
-
- #include <X11/Xlib.h>
- #include <X11/Xatom.h>
Home |
Main Index |
Thread Index |
Old Index