summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--audio/pulseaudio/Makefile3
-rw-r--r--audio/pulseaudio/distinfo4
-rw-r--r--audio/pulseaudio/files/patch-src_pulsecore_svolume_mmx.c20
-rw-r--r--audio/pulseaudio/pkg-plist5
-rw-r--r--graphics/cairo/Makefile6
-rw-r--r--graphics/pornview/Makefile4
-rw-r--r--x11-wm/awesome/Makefile10
-rw-r--r--x11-wm/awesome/distinfo4
-rw-r--r--x11-wm/i3/Makefile5
-rw-r--r--x11-wm/mcwm/Makefile6
-rw-r--r--x11-wm/mcwm/files/patch-Makefile2
-rw-r--r--x11-wm/mcwm/files/patch-mcwm.c164
-rw-r--r--x11/startup-notification/Makefile5
-rw-r--r--x11/startup-notification/distinfo4
14 files changed, 208 insertions, 34 deletions
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index 74e67ca2a8c1..5e710e8b1c3b 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -11,8 +11,7 @@
#
PORTNAME= pulseaudio
-PORTVERSION= 0.9.22
-PORTREVISION= 2
+PORTVERSION= 0.9.23
CATEGORIES= audio
MASTER_SITES= http://freedesktop.org/software/pulseaudio/releases/
diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo
index a7b02d0d5db1..f445b8ea82e0 100644
--- a/audio/pulseaudio/distinfo
+++ b/audio/pulseaudio/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pulseaudio-0.9.22.tar.gz) = c6019324395117a258c048a6db5e9734551cc2c61dc35b46403ff00d64be55f0
-SIZE (pulseaudio-0.9.22.tar.gz) = 2076785
+SHA256 (pulseaudio-0.9.23.tar.gz) = af3e84c614cb632fd1f57105489fcd5f93f906da1ce5aa9019492212031fba4e
+SIZE (pulseaudio-0.9.23.tar.gz) = 2095454
diff --git a/audio/pulseaudio/files/patch-src_pulsecore_svolume_mmx.c b/audio/pulseaudio/files/patch-src_pulsecore_svolume_mmx.c
index 345661e617f0..cda65405d126 100644
--- a/audio/pulseaudio/files/patch-src_pulsecore_svolume_mmx.c
+++ b/audio/pulseaudio/files/patch-src_pulsecore_svolume_mmx.c
@@ -1,20 +1,20 @@
---- src/pulsecore/svolume_mmx.c.orig 2010-02-20 13:53:25.000000000 +0100
-+++ src/pulsecore/svolume_mmx.c 2010-02-20 13:54:22.000000000 +0100
-@@ -153,7 +153,7 @@ pa_volume_s16ne_mmx (int16_t *samples, i
+--- src/pulsecore/svolume_mmx.c.orig 2011-06-23 17:18:54.484125000 -0300
++++ src/pulsecore/svolume_mmx.c 2012-01-04 23:36:03.000000000 -0200
+@@ -154,7 +154,7 @@
"6: \n\t"
" emms \n\t"
- : "+r" (samples), "+r" (volumes), "+r" (length), "=D" ((pa_reg_x86)channel), "=&r" (temp)
+ : "+r" (samples), "+r" (volumes), "+r" (length), "=D" (channel), "=&r" (temp)
- : "rm" ((pa_reg_x86)channels)
- : "cc"
- );
-@@ -229,7 +229,7 @@ pa_volume_s16re_mmx (int16_t *samples, i
+ #if defined (__i386__)
+ : "m" ((pa_reg_x86)channels)
+ #else
+@@ -235,7 +235,7 @@
"6: \n\t"
" emms \n\t"
- : "+r" (samples), "+r" (volumes), "+r" (length), "=D" ((pa_reg_x86)channel), "=&r" (temp)
+ : "+r" (samples), "+r" (volumes), "+r" (length), "=D" (channel), "=&r" (temp)
- : "rm" ((pa_reg_x86)channels)
- : "cc"
- );
+ #if defined (__i386__)
+ : "m" ((pa_reg_x86)channels)
+ #else
diff --git a/audio/pulseaudio/pkg-plist b/audio/pulseaudio/pkg-plist
index 8be11434795d..c512535a9d12 100644
--- a/audio/pulseaudio/pkg-plist
+++ b/audio/pulseaudio/pkg-plist
@@ -128,6 +128,8 @@ lib/pulse-%%PULSE_VERSION%%/modules/module-detect.a
lib/pulse-%%PULSE_VERSION%%/modules/module-detect.so
lib/pulse-%%PULSE_VERSION%%/modules/module-device-restore.a
lib/pulse-%%PULSE_VERSION%%/modules/module-device-restore.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-echo-cancel.a
+lib/pulse-%%PULSE_VERSION%%/modules/module-echo-cancel.so
lib/pulse-%%PULSE_VERSION%%/modules/module-esound-compat-spawnfd.a
lib/pulse-%%PULSE_VERSION%%/modules/module-esound-compat-spawnfd.so
lib/pulse-%%PULSE_VERSION%%/modules/module-esound-compat-spawnpid.a
@@ -254,7 +256,10 @@ share/locale/ta/LC_MESSAGES/pulseaudio.mo
share/locale/te/LC_MESSAGES/pulseaudio.mo
share/locale/uk/LC_MESSAGES/pulseaudio.mo
share/locale/zh_CN/LC_MESSAGES/pulseaudio.mo
+share/vala/vapi/libpulse.deps
share/vala/vapi/libpulse.vapi
+share/vala/vapi/libpulse-mainloop-glib.deps
+share/vala/vapi/libpulse-mainloop-glib.vapi
%%GCONF%%@dirrm libexec/pulse
@dirrm lib/pulse-%%PULSE_VERSION%%/modules
@dirrm lib/pulse-%%PULSE_VERSION%%
diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index cbbf7a9e0dea..2b60476174a2 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -8,7 +8,7 @@
PORTNAME= cairo
PORTVERSION= 1.10.2
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH?= 1
CATEGORIES= graphics
MASTER_SITES= http://cairographics.org/releases/
@@ -59,8 +59,8 @@ PLIST_SUB+= GL="@comment "
.endif
.if defined(WITH_XCB)
-BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util
-RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util
+BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util-renderutil
+RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util-renderutil
CONFIGURE_ARGS+= --enable-xcb
# this option exposes a bug --enable-xlib-xcb=auto
PLIST_SUB+= XCB=""
diff --git a/graphics/pornview/Makefile b/graphics/pornview/Makefile
index 687fab04bac2..8ac221e31803 100644
--- a/graphics/pornview/Makefile
+++ b/graphics/pornview/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pornview
PORTVERSION= 0.2.0.p.1
-PORTREVISION= 24
+PORTREVISION= 25
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/OldFiles
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p./pre/}
@@ -16,7 +16,7 @@ MAINTAINER= dinoex@FreeBSD.org
COMMENT= PornView is an image viewer/manager
LIB_DEPENDS= exif.12:${PORTSDIR}/graphics/libexif
-LIB_DEPENDS+= xcb-render-util:${PORTSDIR}/x11/xcb-util
+LIB_DEPENDS+= xcb-render-util:${PORTSDIR}/x11/xcb-util-renderutil
USE_XORG= x11 xi xext xinerama
USE_GNOME= gtk20
diff --git a/x11-wm/awesome/Makefile b/x11-wm/awesome/Makefile
index fbfcdd089e81..f151f1470004 100644
--- a/x11-wm/awesome/Makefile
+++ b/x11-wm/awesome/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= awesome
-PORTVERSION= 3.4.10
-PORTREVISION= 3
+PORTVERSION= 3.4.11
CATEGORIES= x11-wm
MASTER_SITES= http://awesome.naquadah.org/download/
@@ -21,7 +20,7 @@ BUILD_DEPENDS= asciidoc:${PORTSDIR}/textproc/asciidoc \
gperf>=3.0.3:${PORTSDIR}/devel/gperf \
pango>=1.19.3:${PORTSDIR}/x11-toolkits/pango \
xmlto:${PORTSDIR}/textproc/xmlto \
- xcb-util>=0.3.6:${PORTSDIR}/x11/xcb-util \
+ xcb-util>=0.3.8:${PORTSDIR}/x11/xcb-util \
xproto>=7.0.11:${PORTSDIR}/x11/xproto \
${LOCALBASE}/share/xml/docbook/4.5/docbookx.dtd:${PORTSDIR}/textproc/docbook-450
LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \
@@ -30,7 +29,10 @@ LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \
startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
xdg-basedir.2:${PORTSDIR}/x11/libxdg-basedir \
xcb.2:${PORTSDIR}/x11/libxcb \
- xcb-event.1:${PORTSDIR}/x11/xcb-util \
+ xcb-util.0:${PORTSDIR}/x11/xcb-util \
+ xcb-image.0:${PORTSDIR}/x11/xcb-util-image \
+ xcb-keysyms.1:${PORTSDIR}/x11/xcb-util-keysyms \
+ xcb-icccm.4:${PORTSDIR}/x11/xcb-util-wm \
execinfo.1:${PORTSDIR}/devel/libexecinfo
USE_BZIP2= yes
diff --git a/x11-wm/awesome/distinfo b/x11-wm/awesome/distinfo
index 83eb8bee65f0..2bac09c8a494 100644
--- a/x11-wm/awesome/distinfo
+++ b/x11-wm/awesome/distinfo
@@ -1,2 +1,2 @@
-SHA256 (awesome-3.4.10.tar.bz2) = 3ed72cf9a63b93290d6ce4dcbbb56cff555cb172868aaac02a64dee995e0c3b0
-SIZE (awesome-3.4.10.tar.bz2) = 747589
+SHA256 (awesome-3.4.11.tar.bz2) = 83fc42d4ea71914d1b456023ce53b546e22e8ccc11a73c4a39a1152d2f30b628
+SIZE (awesome-3.4.11.tar.bz2) = 758495
diff --git a/x11-wm/i3/Makefile b/x11-wm/i3/Makefile
index 83c76652c7e4..c552c69470b4 100644
--- a/x11-wm/i3/Makefile
+++ b/x11-wm/i3/Makefile
@@ -7,6 +7,7 @@
PORTNAME= i3
DISTVERSION= 4.1.1
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://i3wm.org/downloads/ \
${MASTER_SITE_LOCAL}
@@ -19,7 +20,9 @@ BUILD_DEPENDS= flex>=2.5.35:${PORTSDIR}/textproc/flex \
pcre>=0:${PORTSDIR}/devel/pcre
LIB_DEPENDS= xcb.2:${PORTSDIR}/x11/libxcb \
startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
- xcb-event.1:${PORTSDIR}/x11/xcb-util \
+ xcb-util.0:${PORTSDIR}/x11/xcb-util \
+ xcb-keysyms.1:${PORTSDIR}/x11/xcb-util-keysyms \
+ xcb-icccm.4:${PORTSDIR}/x11/xcb-util-wm \
ev.4:${PORTSDIR}/devel/libev \
yajl.2:${PORTSDIR}/devel/yajl
RUN_DEPENDS= ${SITE_PERL}/IPC/Run.pm:${PORTSDIR}/devel/p5-IPC-Run
diff --git a/x11-wm/mcwm/Makefile b/x11-wm/mcwm/Makefile
index e3f6b963c48d..01570149012e 100644
--- a/x11-wm/mcwm/Makefile
+++ b/x11-wm/mcwm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mcwm
PORTVERSION= 20111124
+PORTREVISION= 1
CATEGORIES= x11-wm
MASTER_SITES= http://hack.org/mc/hacks/mcwm/
@@ -16,8 +17,9 @@ COMMENT= A small window manager inspired by CTWM, evilwm, and tinywm
LICENSE= ISCL
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= xcb-util>=0.3.6:${PORTSDIR}/x11/xcb-util
-RUN_DEPENDS= xcb-util>=0.3.6:${PORTSDIR}/x11/xcb-util
+LIB_DEPENDS= xcb-util.0:${PORTSDIR}/x11/xcb-util \
+ xcb-keysyms.1:${PORTSDIR}/x11/xcb-util-keysyms \
+ xcb-icccm.4:${PORTSDIR}/x11/xcb-util-wm \
MAKE_JOBS_SAFE= yes
diff --git a/x11-wm/mcwm/files/patch-Makefile b/x11-wm/mcwm/files/patch-Makefile
index 3401fa110efd..5b05b01f3a72 100644
--- a/x11-wm/mcwm/files/patch-Makefile
+++ b/x11-wm/mcwm/files/patch-Makefile
@@ -17,7 +17,7 @@ http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/163667
- -lxcb-atom #-ldmalloc
+CFLAGS+=-g -std=c99 -Wall -Wextra -I/usr/local/include #-DDEBUG #-DDMALLOC
+LDFLAGS+=-L/usr/local/lib -lxcb -lxcb-randr -lxcb-keysyms -lxcb-icccm \
-+ -lxcb-atom -lxcb-property #-ldmalloc
++ -lxcb-util #-ldmalloc
RM=/bin/rm
-PREFIX=/usr/local
diff --git a/x11-wm/mcwm/files/patch-mcwm.c b/x11-wm/mcwm/files/patch-mcwm.c
new file mode 100644
index 000000000000..4d5936cd3a24
--- /dev/null
+++ b/x11-wm/mcwm/files/patch-mcwm.c
@@ -0,0 +1,164 @@
+diff --git a/mcwm.c b/mcwm.c
+index 0613c9f..04a7a41 100644
+--- mcwm.c
++++ mcwm.c
+@@ -45,6 +45,10 @@
+
+ #include <X11/keysym.h>
+
++#include <xcb/xproto.h>
++#include <xcb/xcb_util.h>
++#include <xcb/xcb_ewmh.h>
++
+ #ifdef DEBUG
+ #include "events.h"
+ #endif
+@@ -503,7 +507,7 @@ void setwmdesktop(xcb_drawable_t win, uint32_t ws)
+ PDEBUG("Changing _NET_WM_DESKTOP on window %d to %d\n", win, ws);
+
+ xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win,
+- atom_desktop, CARDINAL, 32, 1,
++ atom_desktop, XCB_ATOM_CARDINAL, 32, 1,
+ &ws);
+ }
+
+@@ -521,7 +525,7 @@ int32_t getwmdesktop(xcb_drawable_t win)
+ uint32_t *wsp;
+ uint32_t ws;
+
+- cookie = xcb_get_any_property(conn, false, win, atom_desktop,
++ cookie = xcb_get_property(conn, false, win, atom_desktop,XCB_GET_PROPERTY_TYPE_ANY, 0,
+ sizeof (int32_t));
+
+ reply = xcb_get_property_reply(conn, cookie, NULL);
+@@ -1136,8 +1140,8 @@ struct client *setupwin(xcb_window_t win)
+ /*
+ * Get the window's incremental size step, if any.
+ */
+- if (!xcb_get_wm_normal_hints_reply(
+- conn, xcb_get_wm_normal_hints_unchecked(
++ if (!xcb_icccm_get_wm_normal_hints_reply(
++ conn, xcb_icccm_get_wm_normal_hints_unchecked(
+ conn, win), &hints, NULL))
+ {
+ PDEBUG("Couldn't get size hints.\n");
+@@ -1147,25 +1151,25 @@ struct client *setupwin(xcb_window_t win)
+ * The user specified the position coordinates. Remember that so
+ * we can use geometry later.
+ */
+- if (hints.flags & XCB_SIZE_HINT_US_POSITION)
++ if (hints.flags & XCB_ICCCM_SIZE_HINT_US_POSITION)
+ {
+ client->usercoord = true;
+ }
+
+- if (hints.flags & XCB_SIZE_HINT_P_MIN_SIZE)
++ if (hints.flags & XCB_ICCCM_SIZE_HINT_P_MIN_SIZE)
+ {
+ client->min_width = hints.min_width;
+ client->min_height = hints.min_height;
+ }
+
+- if (hints.flags & XCB_SIZE_HINT_P_MAX_SIZE)
++ if (hints.flags & XCB_ICCCM_SIZE_HINT_P_MAX_SIZE)
+ {
+
+ client->max_width = hints.max_width;
+ client->max_height = hints.max_height;
+ }
+
+- if (hints.flags & XCB_SIZE_HINT_P_RESIZE_INC)
++ if (hints.flags & XCB_ICCCM_SIZE_HINT_P_RESIZE_INC)
+ {
+ client->width_inc = hints.width_inc;
+ client->height_inc = hints.height_inc;
+@@ -1174,7 +1178,7 @@ struct client *setupwin(xcb_window_t win)
+ client->height_inc);
+ }
+
+- if (hints.flags & XCB_SIZE_HINT_BASE_SIZE)
++ if (hints.flags & XCB_ICCCM_SIZE_HINT_BASE_SIZE)
+ {
+ client->base_width = hints.base_width;
+ client->base_height = hints.base_height;
+@@ -2823,7 +2827,7 @@ void botright(void)
+ void deletewin(void)
+ {
+ xcb_get_property_cookie_t cookie;
+- xcb_get_wm_protocols_reply_t protocols;
++ xcb_icccm_get_wm_protocols_reply_t protocols;
+ bool use_delete = false;
+ uint32_t i;
+
+@@ -2833,14 +2837,14 @@ void deletewin(void)
+ }
+
+ /* Check if WM_DELETE is supported. */
+- cookie = xcb_get_wm_protocols_unchecked(conn, focuswin->id, wm_protocols);
+- if (xcb_get_wm_protocols_reply(conn, cookie, &protocols, NULL) == 1) {
++ cookie = xcb_icccm_get_wm_protocols_unchecked(conn, focuswin->id, wm_protocols);
++ if (xcb_icccm_get_wm_protocols_reply(conn, cookie, &protocols, NULL) == 1) {
+ for (i = 0; i < protocols.atoms_len; i++)
+ if (protocols.atoms[i] == wm_delete_window)
+ use_delete = true;
+ }
+
+- xcb_get_wm_protocols_reply_wipe(&protocols);
++ xcb_icccm_get_wm_protocols_reply_wipe(&protocols);
+
+ if (use_delete)
+ {
+@@ -4082,9 +4086,50 @@ int main(int argc, char **argv)
+ conf.fixedcol = getcolor(fixedcol);
+
+ /* Get some atoms. */
+- atom_desktop = xcb_atom_get(conn, "_NET_WM_DESKTOP");
+- wm_delete_window = xcb_atom_get(conn, "WM_DELETE_WINDOW");
+- wm_protocols = xcb_atom_get(conn, "WM_PROTOCOLS");
++// atom_desktop = xcb_atom_get(conn, "_NET_WM_DESKTOP");
++// wm_delete_window = xcb_atom_get(conn, "WM_DELETE_WINDOW");
++// wm_protocols = xcb_atom_get(conn, "WM_PROTOCOLS");
++
++ char *atom_name;
++ xcb_intern_atom_cookie_t cookie_desktop;
++ xcb_intern_atom_cookie_t cookie_delete_window;
++ xcb_intern_atom_cookie_t cookie_protocols;
++ xcb_intern_atom_reply_t *rep;
++
++ atom_name = "_NET_WM_DESKTOP";
++ cookie_desktop = xcb_intern_atom (conn,
++ 0,
++ strlen (atom_name),
++ atom_name);
++ rep = xcb_intern_atom_reply (conn,
++ cookie_desktop,
++ NULL);
++ atom_desktop = rep->atom;
++ free (rep);
++
++
++ atom_name = "WM_DELETE_WINDOW";
++ cookie_delete_window = xcb_intern_atom (conn,
++ 0,
++ strlen (atom_name),
++ atom_name);
++ rep = xcb_intern_atom_reply (conn,
++ cookie_delete_window,
++ NULL);
++ wm_delete_window = rep->atom;
++ free (rep);
++
++ atom_name = "WM_PROTOCOLS";
++ cookie_protocols = xcb_intern_atom (conn,
++ 0,
++ strlen (atom_name),
++ atom_name);
++ rep = xcb_intern_atom_reply (conn,
++ cookie_protocols,
++ NULL);
++ wm_protocols = rep->atom;
++ free (rep);
++
+
+ /* Check for RANDR extension and configure. */
+ randrbase = setuprandr();
diff --git a/x11/startup-notification/Makefile b/x11/startup-notification/Makefile
index 0e40070f24f1..feae4dbed56d 100644
--- a/x11/startup-notification/Makefile
+++ b/x11/startup-notification/Makefile
@@ -7,8 +7,7 @@
#
PORTNAME= startup-notification
-PORTVERSION= 0.10
-PORTREVISION= 2
+PORTVERSION= 0.12
CATEGORIES= x11 gnome
MASTER_SITES= http://www.freedesktop.org/software/startup-notification/releases/
DIST_SUBDIR= gnome2
@@ -16,7 +15,7 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Library that supports startup notification spec from freedesktop.org
-LIB_DEPENDS= xcb-aux.0:${PORTSDIR}/x11/xcb-util
+LIB_DEPENDS= xcb-util.0:${PORTSDIR}/x11/xcb-util
USE_XORG= x11
USE_AUTOTOOLS= libtool
diff --git a/x11/startup-notification/distinfo b/x11/startup-notification/distinfo
index a69e199d7784..36f7b57ec051 100644
--- a/x11/startup-notification/distinfo
+++ b/x11/startup-notification/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/startup-notification-0.10.tar.gz) = 64bbeb5c28619721fc19d6920ad2b8bf6c0dc3a0e96a1b0bc26f480fbc525459
-SIZE (gnome2/startup-notification-0.10.tar.gz) = 328787
+SHA256 (gnome2/startup-notification-0.12.tar.gz) = 3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a
+SIZE (gnome2/startup-notification-0.12.tar.gz) = 355285
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-04 01:45:13 +0000