From owner-svn-ports-all@FreeBSD.ORG  Fri Apr  4 09:27:09 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id EE68E389;
 Fri,  4 Apr 2014 09:27:09 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DA31F2FE;
 Fri,  4 Apr 2014 09:27:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s349R9Dp099631;
 Fri, 4 Apr 2014 09:27:09 GMT (envelope-from marino@svn.freebsd.org)
Received: (from marino@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s349R9Fg099630;
 Fri, 4 Apr 2014 09:27:09 GMT (envelope-from marino@svn.freebsd.org)
Message-Id: <201404040927.s349R9Fg099630@svn.freebsd.org>
From: John Marino <marino@FreeBSD.org>
Date: Fri, 4 Apr 2014 09:27:09 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r350075 - head/audio/last.fm/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Apr 2014 09:27:10 -0000

Author: marino
Date: Fri Apr  4 09:27:09 2014
New Revision: 350075
URL: http://svnweb.freebsd.org/changeset/ports/350075
QAT: https://qat.redports.org/buildarchive/r350075/

Log:
  audio/last.fm: consolidate patches
  
  Due to strange naming scheme of original patch, I didn't immediately
  realize the same file now has two patches.  Consolidate them and keep
  the new patch file name.

Deleted:
  head/audio/last.fm/files/patch-src_rtaudioplayback_rtaudio-RtAudio.cpp
Modified:
  head/audio/last.fm/files/patch-src_output_RtAudio_rtaudio_RtAudio.cpp

Modified: head/audio/last.fm/files/patch-src_output_RtAudio_rtaudio_RtAudio.cpp
==============================================================================
--- head/audio/last.fm/files/patch-src_output_RtAudio_rtaudio_RtAudio.cpp	Fri Apr  4 09:21:52 2014	(r350074)
+++ head/audio/last.fm/files/patch-src_output_RtAudio_rtaudio_RtAudio.cpp	Fri Apr  4 09:27:09 2014	(r350075)
@@ -1,5 +1,14 @@
---- src/output/RtAudio/rtaudio/RtAudio.cpp.intermediate	2014-04-04 08:59:58.181014000 +0000
+--- src/output/RtAudio/rtaudio/RtAudio.cpp.orig	2014-04-04 08:59:58.151014000 +0000
 +++ src/output/RtAudio/rtaudio/RtAudio.cpp
+@@ -42,7 +42,7 @@
+ #include <QtGlobal>
+ 
+ #ifdef Q_WS_X11
+-    #define __LINUX_ALSA__
++    #define __LINUX_OSS__
+ #endif
+ #ifdef Q_WS_FREEBSD
+     #define __LINUX_OSS__
 @@ -57,6 +57,7 @@
  #include "RtAudio.h"
  #include <iostream>