From yuri.pankov@gmail.com  Sun Jan 15 18:34:17 2012
Return-Path: <yuri.pankov@gmail.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CF15A106566B;
	Sun, 15 Jan 2012 18:34:17 +0000 (UTC)
	(envelope-from yuri.pankov@gmail.com)
Received: from sirius.xvoid.org (sirius.xvoid.org [IPv6:2001:470:28:4ba:20c:29ff:fe62:9a22])
	by mx1.freebsd.org (Postfix) with ESMTP id 032978FC08;
	Sun, 15 Jan 2012 18:34:16 +0000 (UTC)
Received: from spica.xvoid.org (spica.xvoid.org [IPv6:2001:470:28:4ba:223:14ff:fe06:b72c])
	by sirius.xvoid.org (8.14.5/8.14.5) with ESMTP id q0FIYFOs077278;
	Sun, 15 Jan 2012 22:34:15 +0400 (MSK)
	(envelope-from yuri.pankov@gmail.com)
Received: from spica.xvoid.org (localhost [IPv6:::1])
	by spica.xvoid.org (8.14.5/8.14.5) with ESMTP id q0FIYFJF077694;
	Sun, 15 Jan 2012 22:34:15 +0400 (MSK)
	(envelope-from yuri.pankov@gmail.com)
Received: (from yuri@localhost)
	by spica.xvoid.org (8.14.5/8.14.5/Submit) id q0FIYF05077693;
	Sun, 15 Jan 2012 22:34:15 +0400 (MSK)
	(envelope-from yuri.pankov@gmail.com)
Message-Id: <201201151834.q0FIYF05077693@spica.xvoid.org>
Date: Sun, 15 Jan 2012 22:34:15 +0400 (MSK)
From: Yuri Pankov <yuri.pankov@gmail.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: multimedia@freebsd.org
Subject: [PATCH] multimedia/mp4v2: Fix build with clang
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         164180
>Category:       ports
>Synopsis:       [PATCH] multimedia/mp4v2: Fix build with clang
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-multimedia
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 15 18:40:09 UTC 2012
>Closed-Date:    Tue Jan 24 14:32:49 UTC 2012
>Last-Modified:  Wed Jan 25 06:45:03 UTC 2012
>Originator:     Yuri Pankov
>Release:        FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD spica.xvoid.org 10.0-CURRENT FreeBSD 10.0-CURRENT #1 r230138: Sun Jan 15 20:47:14 MSK
>Description:
Fix build with clang (taken from mp4v2 svn).

Added file(s):
- files/patch-src__bmff__typebmff.cpp
- files/patch-src__itmf__type.cpp

Port maintainer (multimedia@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- mp4v2-1.9.1.patch begins here ---
Index: files/patch-src__bmff__typebmff.cpp
===================================================================
RCS file: files/patch-src__bmff__typebmff.cpp
diff -N files/patch-src__bmff__typebmff.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-src__bmff__typebmff.cpp	15 Jan 2012 18:32:57 -0000
@@ -0,0 +1,35 @@
+--- ./src/bmff/typebmff.cpp.orig	2009-07-14 03:07:10.000000000 +0400
++++ ./src/bmff/typebmff.cpp	2012-01-15 22:14:12.057757646 +0400
+@@ -23,19 +23,12 @@
+ 
+ #include "impl.h"
+ 
+-// VStudio idiocy prevents defining template instanced static data
+-// in a namespace. Workaround it by defining in global scope.
+-// Other platforms will continue to put things in the proper namespace.
+-#if defined( _MSC_VER )
+-using namespace mp4v2::impl::bmff;
+-#else
+-namespace mp4v2 { namespace impl { namespace bmff {
+-#endif
++namespace mp4v2 { namespace impl {
+ 
+ ///////////////////////////////////////////////////////////////////////////////
+ 
+ template <>
+-const EnumLanguageCode::Entry EnumLanguageCode::data[] = {
++const bmff::EnumLanguageCode::Entry bmff::EnumLanguageCode::data[] = {
+     { mp4v2::impl::bmff::ILC_AAR,  "aar",  "Afar" },
+     { mp4v2::impl::bmff::ILC_ABK,  "abk",  "Abkhazian" },
+     { mp4v2::impl::bmff::ILC_ACE,  "ace",  "Achinese" },
+@@ -526,9 +519,7 @@
+ 
+ ///////////////////////////////////////////////////////////////////////////////
+ 
+-#if defined( _MSC_VER )
+-namespace mp4v2 { namespace impl { namespace bmff {
+-#endif
++namespace bmff {
+ 
+ ///////////////////////////////////////////////////////////////////////////////
+ 
Index: files/patch-src__itmf__type.cpp
===================================================================
RCS file: files/patch-src__itmf__type.cpp
diff -N files/patch-src__itmf__type.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-src__itmf__type.cpp	15 Jan 2012 18:32:57 -0000
@@ -0,0 +1,80 @@
+--- ./src/itmf/type.cpp.orig	2009-07-14 03:07:08.000000000 +0400
++++ ./src/itmf/type.cpp	2012-01-15 22:14:12.054748862 +0400
+@@ -24,19 +24,12 @@
+ 
+ #include "impl.h"
+ 
+-// VStudio idiocy prevents defining template instanced static data
+-// in a namespace. Workaround it by defining in global scope.
+-// Other platforms will continue to put things in the proper namespace.
+-#if defined( _MSC_VER )
+-using namespace mp4v2::impl::itmf;
+-#else
+-namespace mp4v2 { namespace impl { namespace itmf {
+-#endif
++namespace mp4v2 { namespace impl {
+ 
+ ///////////////////////////////////////////////////////////////////////////////
+ 
+ template <>
+-const EnumBasicType::Entry EnumBasicType::data[] = {
++const itmf::EnumBasicType::Entry itmf::EnumBasicType::data[] = {
+     { mp4v2::impl::itmf::BT_IMPLICIT,  "implicit",  "implicit" },
+     { mp4v2::impl::itmf::BT_UTF8,      "utf8",      "UTF-8" },
+     { mp4v2::impl::itmf::BT_UTF16,     "utf16",     "UTF-16" },
+@@ -64,7 +57,7 @@
+ ///////////////////////////////////////////////////////////////////////////////
+ 
+ template <>
+-const EnumGenreType::Entry EnumGenreType::data[] = {
++const itmf::EnumGenreType::Entry itmf::EnumGenreType::data[] = {
+     { mp4v2::impl::itmf::GENRE_BLUES,             "blues",             "Blues" },
+     { mp4v2::impl::itmf::GENRE_CLASSIC_ROCK,      "classicrock",       "Classic Rock" },
+     { mp4v2::impl::itmf::GENRE_COUNTRY,           "country",           "Country" },
+@@ -200,7 +193,7 @@
+ ///////////////////////////////////////////////////////////////////////////////
+ 
+ template <>
+-const EnumStikType::Entry EnumStikType::data[] = {
++const itmf::EnumStikType::Entry itmf::EnumStikType::data[] = {
+     { mp4v2::impl::itmf::STIK_OLD_MOVIE,    "oldmovie",    "Movie" },
+     { mp4v2::impl::itmf::STIK_NORMAL,       "normal",      "Normal" },
+     { mp4v2::impl::itmf::STIK_AUDIOBOOK,    "audiobook",   "Audio Book" },
+@@ -216,7 +209,7 @@
+ ///////////////////////////////////////////////////////////////////////////////
+ 
+ template <>
+-const EnumAccountType::Entry EnumAccountType::data[] = {
++const itmf::EnumAccountType::Entry itmf::EnumAccountType::data[] = {
+     { mp4v2::impl::itmf::AT_ITUNES,  "itunes",   "iTunes" },
+     { mp4v2::impl::itmf::AT_AOL,     "aol",      "AOL" },
+ 
+@@ -226,7 +219,7 @@
+ ///////////////////////////////////////////////////////////////////////////////
+ 
+ template <>
+-const EnumCountryCode::Entry EnumCountryCode::data[] = {
++const itmf::EnumCountryCode::Entry itmf::EnumCountryCode::data[] = {
+     { mp4v2::impl::itmf::CC_USA,  "usa",   "United States" },
+     { mp4v2::impl::itmf::CC_USA,  "fra",   "France" },
+     { mp4v2::impl::itmf::CC_DEU,  "ger",   "Germany" },
+@@ -256,7 +249,7 @@
+ ///////////////////////////////////////////////////////////////////////////////
+ 
+ template <>
+-const EnumContentRating::Entry EnumContentRating::data[] = {
++const itmf::EnumContentRating::Entry itmf::EnumContentRating::data[] = {
+     { mp4v2::impl::itmf::CR_NONE,      "none",       "None" },
+     { mp4v2::impl::itmf::CR_CLEAN,     "clean",      "Clean" },
+     { mp4v2::impl::itmf::CR_EXPLICIT,  "explicit",   "Explicit" },
+@@ -266,9 +259,7 @@
+ 
+ ///////////////////////////////////////////////////////////////////////////////
+ 
+-#if defined( _MSC_VER )
+-namespace mp4v2 { namespace impl { namespace itmf {
+-#endif
++namespace itmf {
+ 
+ ///////////////////////////////////////////////////////////////////////////////
+ 
--- mp4v2-1.9.1.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->freebsd-multimedia 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Jan 15 18:40:19 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=164180 

Date: Tue, 24 Jan 2012 11:21:43 +0100
From: Alberto Villa <avilla@FreeBSD.org>
Sender: villa.alberto@gmail.com
To: Yuri Pankov <yuri.pankov@gmail.com>
Subject: Re: [PATCH] multimedia/mp4v2: Fix build with clang

 Will anyone work on this or may I assing it myself? I know, I'm not in
 multimedia@, but I'm in kde@ and I'd like it to make progress with
 Clang (and this is blocking it).
 -- 
 Alberto Villa, FreeBSD committer <avilla@FreeBSD.org>
 http://people.FreeBSD.org/~avilla

Date: Tue, 24 Jan 2012 12:24:50 +0000
From: Max Brazhnikov <makc@issp.ac.ru>
To: freebsd-multimedia@freebsd.org
Subject: Re: [PATCH] multimedia/mp4v2: Fix build with clang

 grab PR and consider yourself in multimedia@ :)
 
 Max

Date: Tue, 24 Jan 2012 13:30:17 +0100
From: Alberto Villa <avilla@FreeBSD.org>
Sender: villa.alberto@gmail.com
To: Max Brazhnikov <makc@issp.ac.ru>
Subject: Re: [PATCH] multimedia/mp4v2: Fix build with clang

 On Tue, Jan 24, 2012 at 1:24 PM, Max Brazhnikov <makc@issp.ac.ru> wrote:
 > grab PR and consider yourself in multimedia@ :)
 
 Yay! :)
 -- 
 Alberto Villa, FreeBSD committer <avilla@FreeBSD.org>
 http://people.FreeBSD.org/~avilla

State-Changed-From-To: open->closed 
State-Changed-By: avilla 
State-Changed-When: Tue Jan 24 14:32:47 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=164180 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/164180: commit references a PR
Date: Tue, 24 Jan 2012 14:32:38 +0000 (UTC)

 avilla      2012-01-24 14:32:24 UTC
 
   FreeBSD ports repository
 
   Added files:
     multimedia/mp4v2/files patch-src__bmff__typebmff.cpp 
                            patch-src__itmf__type.cpp 
   Log:
   - Fix build with Clang.
   
   PR:             164180
   Submitted by:   Yuri Pankov <yuri.pankov@gmail.com>
   
   Revision  Changes    Path
   1.1       +35 -0     ports/multimedia/mp4v2/files/patch-src__bmff__typebmff.cpp (new)
   1.1       +80 -0     ports/multimedia/mp4v2/files/patch-src__itmf__type.cpp (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
