Permalink
Browse files

Update with marcuscom gnome3 / cinnamon repo

  • Loading branch information...
1 parent 079af53 commit efd6391385a495c82fca9f98b693688024f40733 @kmoore134 kmoore134 committed Mar 28, 2014
@@ -13,7 +13,6 @@ MASTER_SITES= http://freedesktop.org/software/pulseaudio/releases/
MAINTAINER= gnome@FreeBSD.org
COMMENT= Sound server for UNIX
-# keep the json version otherwise it will match json-glib
LIB_DEPENDS= libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
libsndfile.so:${PORTSDIR}/audio/libsndfile \
libspeexdsp.so:${PORTSDIR}/audio/speex \
@@ -25,14 +24,13 @@ LIB_DEPENDS= libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
libck-connector.so:${PORTSDIR}/sysutils/consolekit
-USE_XZ= yes
USE_GNOME= glib20 intltool gnomehier
USE_XORG= x11 sm xtst ice
USE_LDCONFIG= yes
-USES= gettext gmake libtool pathfix pkgconfig
+USES= gettext gmake libtool pathfix pkgconfig tar:xz
GNU_CONFIGURE= yes
USE_AUTOTOOLS= libltdl
-MAKE_JOBS_UNSAFE=yes
+#MAKE_JOBS_UNSAFE=yes
CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}" \
OPENSSL_CFLAGS="-I/usr/include" \
@@ -57,7 +55,7 @@ USERS= pulse
GROUPS= pulse pulse-access pulse-rt
OPTIONS_DEFINE= JACK AVAHI GCONF ALSA SIMD
-OPTIONS_DEFAULT=AVAHI GCONF SIMD
+OPTIONS_DEFAULT=AVAHI SIMD
PULSE_VERSION= ${PORTVERSION}
PLIST_SUB= PULSE_VERSION=${PULSE_VERSION}
@@ -1,10 +1,12 @@
---- src/modules/oss/module-oss.c.orig 2014-01-23 13:57:55.000000000 -0500
-+++ src/modules/oss/module-oss.c 2014-03-05 15:56:36.924173392 -0500
-@@ -1229,10 +1229,12 @@
+--- src/modules/oss/module-oss.c.orig 2014-01-23 19:57:55.000000000 +0100
++++ src/modules/oss/module-oss.c 2014-03-22 10:59:05.000000000 +0100
+@@ -1229,10 +1229,14 @@ int pa__init(pa_module*m) {
use_mmap = false;
}
+#ifndef __FreeBSD__
++/* Disable mmap. The OSS on FreeBSD doesn't support read & write on
++ the same socket */
if (use_mmap && mode == O_WRONLY) {
pa_log_info("Device opened for playback only, cannot do memory mapping, falling back to UNIX write() mode.");
use_mmap = false;
@@ -13,7 +15,7 @@
if (pa_oss_get_hw_description(dev, hwdesc, sizeof(hwdesc)) >= 0)
pa_log_info("Hardware name is '%s'.", hwdesc);
-@@ -1428,7 +1430,7 @@
+@@ -1428,7 +1432,7 @@ int pa__init(pa_module*m) {
if ((u->mixer_fd = pa_oss_open_mixer_for_device(u->device_name)) >= 0) {
bool do_close = true;
@@ -1,24 +0,0 @@
---- src/pulsecore/pstream.c.orig 2014-01-23 13:57:55.000000000 -0500
-+++ src/pulsecore/pstream.c 2014-03-06 09:42:44.754769964 -0500
-@@ -182,15 +182,18 @@
- p->mainloop->defer_enable(p->defer_event, 0);
-
- if (!p->dead && pa_iochannel_is_readable(p->io)) {
-- if (do_read(p) < 0)
-+ if (do_read(p) < 0) {
- goto fail;
-- } else if (!p->dead && pa_iochannel_is_hungup(p->io))
-+ }
-+ } else if (!p->dead && pa_iochannel_is_hungup(p->io)) {
- goto fail;
-+ }
-
- while (!p->dead && pa_iochannel_is_writable(p->io)) {
- int r = do_write(p);
-- if (r < 0)
-+ if (r < 0) {
- goto fail;
-+ }
- if (r == 0)
- break;
- }
View
@@ -149,10 +149,10 @@ lib/pulse-%%PULSE_VERSION%%/modules/module-stream-restore.so
lib/pulse-%%PULSE_VERSION%%/modules/module-suspend-on-idle.so
lib/pulse-%%PULSE_VERSION%%/modules/module-switch-on-connect.so
lib/pulse-%%PULSE_VERSION%%/modules/module-switch-on-port-available.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-sink.so
-lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-source.so
lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-sink-new.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-sink.so
lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-source-new.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-source.so
lib/pulse-%%PULSE_VERSION%%/modules/module-virtual-sink.so
lib/pulse-%%PULSE_VERSION%%/modules/module-virtual-source.so
lib/pulse-%%PULSE_VERSION%%/modules/module-virtual-surround-sink.so
@@ -279,138 +279,6 @@ share/vala/vapi/libpulse.vapi
@dirrmtry lib/cmake
@dirrm include/pulse
@dirrm etc/pulse
-@dirrmtry share/xmodmap
-@dirrmtry share/vfolders
-@dirrmtry share/vala/vapi
-@dirrmtry share/vala
-@dirrmtry share/sounds
-@dirrmtry share/sgml/docbook/gnome-customization-0.1
-@dirrmtry share/sgml/docbook
-@dirrmtry share/pixmaps/splash
-@dirrmtry share/pixmaps/document-icons
-@dirrmtry share/omf
-@dirrmtry share/oaf
-@dirrmtry share/mime-info
-@dirrmtry share/mc/templates
-@dirrmtry share/mc
-@dirrmtry share/mate/help
-@dirrmtry share/mate-control-center/keybindings
-@dirrmtry share/mate-control-center
-@dirrmtry share/mate-2.0/ui
-@dirrmtry share/mate-2.0
-@dirrmtry share/mate
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/images
-@dirrmtry share/gnome/wm-properties
-@dirrmtry share/gnome/ui
-@dirrmtry share/gnome/panel
-@dirrmtry share/gnome/help/lgpl/C
-@dirrmtry share/gnome/help/lgpl
-@dirrmtry share/gnome/help/gpl/C
-@dirrmtry share/gnome/help/gpl
-@dirrmtry share/gnome/help/fdl/C
-@dirrmtry share/gnome/help/fdl
-@dirrmtry share/gnome/help
-@dirrmtry share/gnome/autostart
-@dirrmtry share/gnome/apps/Utilities
-@dirrmtry share/gnome/apps/System
-@dirrmtry share/gnome/apps/Settings/Session
-@dirrmtry share/gnome/apps/Settings/Peripherals
-@dirrmtry share/gnome/apps/Settings/Documents
-@dirrmtry share/gnome/apps/Settings/Desktop
-@dirrmtry share/gnome/apps/Settings
-@dirrmtry share/gnome/apps/Multimedia
-@dirrmtry share/gnome/apps/Internet
-@dirrmtry share/gnome/apps/Graphics
-@dirrmtry share/gnome/apps/Games
-@dirrmtry share/gnome/apps/Development
-@dirrmtry share/gnome/apps/Audio
-@dirrmtry share/gnome/apps/Applications
-@dirrmtry share/gnome/apps
-@dirrmtry share/gnome-settings-daemon-3.0
-@dirrmtry share/gnome-control-center/keybindings
-@dirrmtry share/gnome-control-center
-@dirrmtry share/gnome-about
-@dirrmtry share/gnome-2.0/ui
-@dirrmtry share/gnome-2.0
-@dirrmtry share/gnome
-@dirrmtry share/gir-1.0
-@dirrmtry share/doc/libgda
-@dirrmtry share/control-center/keybindings/gtk-modules
-@dirrmtry share/control-center/keybindings
-@dirrmtry share/control-center/capplets
-@dirrmtry share/control-center/Session
-@dirrmtry share/control-center/Peripherals
-@dirrmtry share/control-center/Documents
-@dirrmtry share/control-center/Desktop
-@dirrmtry share/control-center-2.0/capplets
-@dirrmtry share/control-center-2.0
-@dirrmtry share/control-center
-@dirrmtry share/capplets
-@dirrmtry share/application-registry
-@dirrmtry share/applets/Utility
-@dirrmtry share/applets/Network
-@dirrmtry share/applets/Multimedia
-@dirrmtry share/applets/Monitors
-@dirrmtry share/applets/Clocks
-@dirrmtry share/applets/Amusements
-@dirrmtry share/applets
-@dirrmtry share/MateConf/gsettings
-@dirrmtry share/MateConf
-@dirrmtry libdata/matecomponent/servers
-@dirrmtry libdata/matecomponent
-@dirrmtry libdata/bonobo/servers
-@dirrmtry libdata/bonobo
-@dirrmtry lib/vfs/modules
-@dirrmtry lib/vfs
-@dirrmtry lib/matecomponent/monikers
-@dirrmtry lib/matecomponent-2.0/samples
-@dirrmtry lib/matecomponent-2.0
-@dirrmtry lib/matecomponent
-@dirrmtry lib/mate-vfs-2.0/modules
-@dirrmtry lib/mate-vfs-2.0
-@dirrmtry lib/gnome-vfs-2.0/modules
-@dirrmtry lib/gnome-vfs-2.0
-@dirrmtry lib/girepository-1.0
-@dirrmtry lib/bonobo/plugin
-@dirrmtry lib/bonobo/monikers
-@dirrmtry lib/bonobo
-@dirrmtry lib/GConf
-@dirrmtry include/gnome-1.0
-@dirrmtry include/gdkcardimage
-@dirrmtry include/gconf
-@dirrmtry etc/xdg/autostart
-@dirrmtry etc/xdg
-@dirrmtry etc/vfs/modules
-@dirrmtry etc/vfs
-@dirrmtry etc/sound/events
-@dirrmtry etc/sound
-@dirrmtry etc/mateconf/schemas
-@dirrmtry etc/mateconf/mateconf.xml.system
-@dirrmtry etc/mateconf/mateconf.xml.mandatory
-@dirrmtry etc/mateconf/mateconf.xml.defaults
-@dirrmtry etc/mateconf
-@dirrmtry etc/gnome/config
-@dirrmtry etc/gnome-vfs-2.0/modules
-@dirrmtry etc/gnome-vfs-2.0
-@dirrmtry etc/gnome
-@dirrmtry etc/gconf/schemas
-@dirrmtry etc/gconf/gconf.xml.system
-@dirrmtry etc/gconf/gconf.xml.mandatory
-@dirrmtry etc/gconf/gconf.xml.defaults
-@dirrmtry etc/gconf
-@dirrmtry etc/dconf/profile
-@dirrmtry etc/dconf/db
-@dirrmtry etc/dconf
-@dirrmtry etc/dbus-1/system.d
-@dirrmtry etc/dbus-1
-@dirrmtry etc/X11/sysconfig
-@dirrmtry etc/X11/starthere
-@dirrmtry etc/X11/serverconfig
-@dirrmtry etc/X11
-@dirrmtry etc/CORBA/servers
-@dirrmtry etc/CORBA
@dirrmtry share/locale/sr@latin/LC_MESSAGES
@dirrmtry share/locale/sr@latin
@dirrmtry share/locale/mr/LC_MESSAGES
View
@@ -1,18 +1,18 @@
# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
# $FreeBSD$
-# $MCom: ports/trunk/net-im/libnice/Makefile 18965 2013-12-20 11:02:42Z kwm $
+# $MCom: ports/trunk/net-im/libnice/Makefile 19243 2014-03-23 09:49:52Z kwm $
PORTNAME= libnice
-PORTVERSION= 0.1.4
+PORTVERSION= 0.1.5
CATEGORIES= net-im devel
MASTER_SITES= http://nice.freedesktop.org/releases/
MAINTAINER= gnome@FreeBSD.org
COMMENT= Library and transmitter that implements ICE-19
-USES= gettext gmake pathfix pkgconfig
+USES= gettext gmake libtool pathfix pkgconfig
USE_LDCONFIG= yes
-USE_GNOME= glib20 ltverhack
+USE_GNOME= glib20
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_GETIFADDRS
LDFLAGS+= -L${LOCALBASE}/lib
@@ -48,6 +48,7 @@ post-patch:
's|-Wno-missing-field-initializers|#|g'
@${REINPLACE_CMD} -e 's|-Wno-missing-field-initializers|#|g' \
${WRKSRC}/common.mk
+ @${REINPLACE_CMD} -e 's|-Werror||g' ${WRKSRC}/configure
post-install:
.if !defined(LIBNICE_SLAVE)
View
@@ -1,2 +1,2 @@
-SHA256 (libnice-0.1.4.tar.gz) = 44e517de9c01203158f2a3d59f058706299a4ae41dfe1a7eeb72c290fcc8bf57
-SIZE (libnice-0.1.4.tar.gz) = 712256
+SHA256 (libnice-0.1.5.tar.gz) = 0a2743b69c8f50b8ca85243abe81b8d884b210430f413ca94b55bcff62fdf097
+SIZE (libnice-0.1.5.tar.gz) = 819737
View
@@ -20,8 +20,12 @@ lib/libnice.a
lib/libnice.la
lib/libnice.so
lib/libnice.so.10
+lib/libnice.so.10.3.0
libdata/pkgconfig/nice.pc
share/gtk-doc/html/libnice/NiceAgent.html
+share/gtk-doc/html/libnice/annotation-glossary.html
+share/gtk-doc/html/libnice/api-index-deprecated.html
+share/gtk-doc/html/libnice/api-index-full.html
share/gtk-doc/html/libnice/ch01.html
share/gtk-doc/html/libnice/ch02.html
share/gtk-doc/html/libnice/ch03.html
@@ -30,6 +34,14 @@ share/gtk-doc/html/libnice/ch05.html
share/gtk-doc/html/libnice/home.png
share/gtk-doc/html/libnice/index.html
share/gtk-doc/html/libnice/index.sgml
+share/gtk-doc/html/libnice/ix03.html
+share/gtk-doc/html/libnice/ix04.html
+share/gtk-doc/html/libnice/ix05.html
+share/gtk-doc/html/libnice/ix06.html
+share/gtk-doc/html/libnice/ix07.html
+share/gtk-doc/html/libnice/ix08.html
+share/gtk-doc/html/libnice/ix09.html
+share/gtk-doc/html/libnice/ix10.html
share/gtk-doc/html/libnice/left.png
share/gtk-doc/html/libnice/libnice-Bind.html
share/gtk-doc/html/libnice/libnice-Debug-messages.html
@@ -38,6 +50,7 @@ share/gtk-doc/html/libnice/libnice-Network-interfaces-discovery.html
share/gtk-doc/html/libnice/libnice-NiceAddress.html
share/gtk-doc/html/libnice/libnice-NiceCandidate.html
share/gtk-doc/html/libnice/libnice-Pseudo-TCP-Socket.html
+share/gtk-doc/html/libnice/libnice-STUN-Constants.html
share/gtk-doc/html/libnice/libnice-StunAgent.html
share/gtk-doc/html/libnice/libnice-StunMessage.html
share/gtk-doc/html/libnice/libnice-TURN.html
@@ -46,6 +59,7 @@ share/gtk-doc/html/libnice/libnice.devhelp2
share/gtk-doc/html/libnice/pt01.html
share/gtk-doc/html/libnice/pt02.html
share/gtk-doc/html/libnice/pt03.html
+share/gtk-doc/html/libnice/pt04.html
share/gtk-doc/html/libnice/right.png
share/gtk-doc/html/libnice/style.css
share/gtk-doc/html/libnice/up.png
@@ -1,9 +1,9 @@
# Created by: Koop Mast <kwm@FreeBSD.org>
# $FreeBSD$
-# $MCom: ports/trunk/sysutils/accountsservice/Makefile 19139 2014-03-15 14:48:11Z kwm $
+# $MCom: ports/trunk/sysutils/accountsservice/Makefile 19237 2014-03-23 07:57:22Z gusi $
PORTNAME= accountsservice
-PORTVERSION= 0.6.35
+PORTVERSION= 0.6.37
CATEGORIES= sysutils devel
MASTER_SITES= http://www.freedesktop.org/software/${PORTNAME}/
@@ -1,2 +1,2 @@
-SHA256 (accountsservice-0.6.35.tar.xz) = 65a1c7013c9c6785c7feb710ee940bb297207dabdb93561fdfdd140e0dfd3038
-SIZE (accountsservice-0.6.35.tar.xz) = 360824
+SHA256 (accountsservice-0.6.37.tar.xz) = b0b21136dc9d74a7135fd5ed7fa1a8069efb91bc6ecc1ef8911125433345a5c1
+SIZE (accountsservice-0.6.37.tar.xz) = 363244
@@ -1,13 +0,0 @@
---- src/Makefile.in.orig 2014-03-15 15:02:34.000000000 +0100
-+++ src/Makefile.in 2014-03-15 15:03:04.000000000 +0100
-@@ -435,6 +435,10 @@
- libaccounts-generated.la \
- $(POLKIT_LIBS)
-
-+EXTRA_DIST = \
-+ fgetpwent.c \
-+ $(NULL)
-+
- CLEANFILES = \
- $(BUILT_SOURCES) \
- *.gcda \
Oops, something went wrong.

0 comments on commit efd6391

Please sign in to comment.