[SM-Commit] GIT changes to master grimoire by Eric Sandall (2e82412183a168d3d3f072780fa786c5d2a97d28)

Eric Sandall scm at sourcemage.org
Wed May 19 16:57:35 EDT 2010


GIT changes to master grimoire by Eric Sandall <sandalle at sourcemage.org>:

 ChangeLog                        |    3 +++
 audio-creation/gtkpod/DEPENDS    |    2 +-
 audio-creation/gtkpod/HISTORY    |    1 +
 audio-libs/faad2/DEPENDS         |    2 +-
 audio-libs/faad2/HISTORY         |    3 +++
 audio-libs/libmp4v2/BUILD        |    1 +
 audio-libs/libmp4v2/DEPENDS      |    1 -
 audio-libs/libmp4v2/DETAILS      |    8 ++------
 audio-libs/libmp4v2/HISTORY      |    6 +++++-
 audio-libs/libmp4v2/INSTALL      |    1 +
 audio-libs/libmp4v2/PRE_BUILD    |    1 +
 audio-libs/libmp4v2/PROVIDES     |    1 -
 audio-libs/libmp4v2/UP_TRIGGERS  |    6 ++++++
 audio-libs/libtunepimp/DEPENDS   |    2 +-
 audio-libs/libtunepimp/HISTORY   |    4 ++++
 audio-libs/libtunepimp/PRE_BUILD |    9 +++------
 audio-libs/mp4v2/CONFLICTS       |    1 +
 audio-libs/mp4v2/HISTORY         |    5 ++++-
 audio-libs/mp4v2/PROVIDES        |    1 -
 audio-players/cmus/DEPENDS       |    4 ++--
 audio-players/cmus/HISTORY       |    1 +
 audio-soft/easytag/DEPENDS       |    2 +-
 audio-soft/easytag/HISTORY       |    1 +
 audio-soft/mediatomb/DEPENDS     |    2 +-
 audio-soft/mediatomb/HISTORY     |    3 +++
 kde4-apps/kid3-kde4/DEPENDS      |    2 +-
 kde4-apps/kid3-kde4/HISTORY      |    3 +++
 27 files changed, 51 insertions(+), 25 deletions(-)

New commits:
commit 2e82412183a168d3d3f072780fa786c5d2a97d28
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    kid3-kde4: libmp4v2 deprecated in favour of mp4v2 (Bug #15536)

commit 1b0063f048a8adac8065b505b56d0f5ca5c770a6
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    mediatomb: libmp4v2 deprecated in favour of mp4v2 (Bug #15536)

commit b90871b34b126b613696be7bd56a0d3f63008535
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    easytag: libmp4v2 deprecated in favour of mp4v2 (Bug #15536)

commit 665da96a1e5663efd3d54a2d4812289588332d5e
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    cmus: libmp4v2 deprecated in favour of mp4v2 (Bug #15536)

commit 1bd60fe840900638ddd3d8e6fcba77eb810c751d
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    libtunepimp: libmp4v2 deprecated in favour of mp4v2 (Bug #15536)

commit 259ef0d781aaeaee3226d6c4b5b82ff342e2b60d
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    faad2: libmp4v2 deprecated in favour of mp4v2 (Bug #15536)

commit 898cc65c003583bde94169ba2ec266f58790e2bf
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    gtkpod: libmp4v2 deprecated in favour of mp4v2 (Bug #15536)

commit 8259a1cf9a0a6d73fec21087fcb34daa3488a797
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    libmp4v2: Also trigger recast of dependees for API change

commit a7a93f61adf4fca8c883c50171c1b52402b23a23
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    mp4v2: Fix old date

commit f65629f60a00df9a60922349565427568e184e20
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    libmp4v2: Fix old date

commit 36e4162ccf8f2958fadbd3dbe14d69e7238e3034
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    libmp4v2: Deprecate in favour of mp4v2

diff --git a/ChangeLog b/ChangeLog
index 970e7f1..4a72cab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2010-05-19 Eric Sandall <sandalle at sourcemage.org>
+	* audio-libs/libmp4v2: Deprecate in favour of mp4v2
+
 2010-05-10 Vlad Glagolev <stealth at sourcemage.org>
 	* gnu.gpg: added key F059B1D1 (Bruno Haible (Open Source Development)
 	  <bruno at clisp.org>)
diff --git a/audio-creation/gtkpod/DEPENDS b/audio-creation/gtkpod/DEPENDS
index ebc9b5d..28086cc 100755
--- a/audio-creation/gtkpod/DEPENDS
+++ b/audio-creation/gtkpod/DEPENDS
@@ -23,7 +23,7 @@ optional_depends  "hal" \
                   "--without-hal" \
                   "HAL device autodetection support" &&
 
-optional_depends  "MP4V2" \
+optional_depends  "mp4v2" \
                   "--with-mp4v2" \
                   "--without-mp4v2" \
                   "MP4/AAC support" &&
diff --git a/audio-creation/gtkpod/HISTORY b/audio-creation/gtkpod/HISTORY
index af707d7..d056b88 100644
--- a/audio-creation/gtkpod/HISTORY
+++ b/audio-creation/gtkpod/HISTORY
@@ -1,6 +1,7 @@
 2010-05-19 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Updated to 0.99.16 (website page is out-of-date)
 	* DEPENDS: May now use either provider of MP4V2 (Bug #15684)
+	  libmp4v2 deprecated in favour of mp4v2 (Bug #15536)
 
 2009-04-25 Remko van der Vossen <wich at sourcemage.org>
 	* DEPENDS: s/glib/glib2/
diff --git a/audio-libs/faad2/DEPENDS b/audio-libs/faad2/DEPENDS
index 546a316..1f1c4a3 100755
--- a/audio-libs/faad2/DEPENDS
+++ b/audio-libs/faad2/DEPENDS
@@ -12,7 +12,7 @@ if [ "$FAAD_CVS" = "y" ]; then
   depends  CVS
 fi
 
-optional_depends  MP4V2                \
+optional_depends  mp4v2                \
                   "--with-mpeg4ip"        \
                   "--without-mpeg4ip"     \
                   "For MPEG4v2 support"
diff --git a/audio-libs/faad2/HISTORY b/audio-libs/faad2/HISTORY
index 8e2c38d..a7866ef 100644
--- a/audio-libs/faad2/HISTORY
+++ b/audio-libs/faad2/HISTORY
@@ -1,3 +1,6 @@
+2010-05-19 Eric Sandall <sandalle at sourcemage.org>
+	* DEPENDS: libmp4v2 deprecated in favour of mp4v2 (Bug #15536)
+
 2010-04-22 Eric Sandall <sandalle at sourcemage.org>
 	* DEPENDS: May use any provider of MP4V2
 
diff --git a/audio-libs/libmp4v2/BUILD b/audio-libs/libmp4v2/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/audio-libs/libmp4v2/BUILD
@@ -0,0 +1 @@
+true
diff --git a/audio-libs/libmp4v2/DEPENDS b/audio-libs/libmp4v2/DEPENDS
deleted file mode 100755
index fd0b0eb..0000000
--- a/audio-libs/libmp4v2/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends g++
diff --git a/audio-libs/libmp4v2/DETAILS b/audio-libs/libmp4v2/DETAILS
index 5d7c16e..cd8017a 100755
--- a/audio-libs/libmp4v2/DETAILS
+++ b/audio-libs/libmp4v2/DETAILS
@@ -1,14 +1,10 @@
            SPELL=libmp4v2
          VERSION=1.5.0.1
-          SOURCE=$SPELL-$VERSION.tar.bz2
-     SOURCE_HASH=sha512:8335db8eb60935d4597e1c950678156b15ce2802227ba6c39289feeeee57cca8d39cfb51e07d79e028f8ec9a924966738f601d328f23ae140e7293ee613367d5
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://resare.com/libmp4v2/dist/$SOURCE
-      LICENSE[0]=MPL
+      PATCHLEVEL=1
         WEB_SITE=http://http://resare.com/libmp4v2/
          ENTERED=20070709
         KEYWORDS="library audio"
-       BUILD_API=2
+         ARCHIVE="off"
            SHORT="Library to read and manipulate the mp4 container format"
 cat << EOF
 Library to read and manipulate the mp4 container format.
diff --git a/audio-libs/libmp4v2/HISTORY b/audio-libs/libmp4v2/HISTORY
index 477816d..2ea3652 100644
--- a/audio-libs/libmp4v2/HISTORY
+++ b/audio-libs/libmp4v2/HISTORY
@@ -1,4 +1,8 @@
-2010-09-20 Eric Sandall <sandalle at sourcemage.org>
+2010-05-19 Eric Sandall <sandalle at sourcemage.org>
+	* Deprecate in favour of mp4v2
+	* UP_TRIGGERS: Also trigger recast of dependees for API change
+
+2010-04-20 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Corrected WEB_SITE
 	* PROVIDES: Provides MP4V2
 
diff --git a/audio-libs/libmp4v2/INSTALL b/audio-libs/libmp4v2/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/audio-libs/libmp4v2/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/audio-libs/libmp4v2/PRE_BUILD b/audio-libs/libmp4v2/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/audio-libs/libmp4v2/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/audio-libs/libmp4v2/PROVIDES b/audio-libs/libmp4v2/PROVIDES
deleted file mode 100755
index 5e0d485..0000000
--- a/audio-libs/libmp4v2/PROVIDES
+++ /dev/null
@@ -1 +0,0 @@
-provides MP4V2
diff --git a/audio-libs/libmp4v2/UP_TRIGGERS b/audio-libs/libmp4v2/UP_TRIGGERS
new file mode 100755
index 0000000..b3b456f
--- /dev/null
+++ b/audio-libs/libmp4v2/UP_TRIGGERS
@@ -0,0 +1,6 @@
+up_trigger libmp4v2 dispel_self
+up_trigger mp4v2 cast_self
+
+for each in $(show_up_depends $SPELL 1); do
+  up_trigger $each cast_self
+done
diff --git a/audio-libs/libtunepimp/DEPENDS b/audio-libs/libtunepimp/DEPENDS
index 030abcb..f85bea8 100755
--- a/audio-libs/libtunepimp/DEPENDS
+++ b/audio-libs/libtunepimp/DEPENDS
@@ -3,7 +3,7 @@ if [[ "${LIBTUNEPIMP_PYTHON}" == "y" ]]
 then depends python
 fi                     &&
 depends libofa         &&
-optional_depends MP4V2 "" "" "for MPEG4 support" &&
+optional_depends mp4v2 "" "" "for MPEG4 support" &&
 optional_depends libmad "" "" "mp3 support?" &&
 optional_depends libvorbis "" "" "ogg support?" &&
 optional_depends flac "" "" "FLAC support?" &&
diff --git a/audio-libs/libtunepimp/HISTORY b/audio-libs/libtunepimp/HISTORY
index 4618c08..672d2f7 100644
--- a/audio-libs/libtunepimp/HISTORY
+++ b/audio-libs/libtunepimp/HISTORY
@@ -1,3 +1,7 @@
+2010-05-19 Eric Sandall <sandalle at sourcemage.org>
+	* DEPENDS: libmp4v2 deprecated in favour of mp4v2 (Bug #15536)
+	* PRE_BUILD: Always apply mp4v2 patch
+
 2010-04-25 Eric Sandall <sandalle at sourcemage.org>
 	* DEPENDS: Optionally depends on any provider of MP4V2 (Bug #15687)
 	* PRE_BUILD: Apply mp4v2-1.9.patch if mp4v2 is providing MP4V2 (Bug #15687)
diff --git a/audio-libs/libtunepimp/PRE_BUILD b/audio-libs/libtunepimp/PRE_BUILD
index d345568..9fd0f0a 100755
--- a/audio-libs/libtunepimp/PRE_BUILD
+++ b/audio-libs/libtunepimp/PRE_BUILD
@@ -5,9 +5,6 @@ zcat $SCRIPT_DIRECTORY/gcc43.patch | patch -p1  &&
 message "${MESSAGE_COLOR}Patching for GCC 4.4...${DEFAULT_COLOR}" &&
 patch $SOURCE_DIRECTORY/lib/fileio.cpp \
       $SCRIPT_DIRECTORY/gcc44.patch &&
-
-if [[ "$(get_spell_provider $SPELL MP4V2)" == "mp4v2" ]]; then
-  message "${MESSAGE_COLOR}Patching for mp4v2...${DEFAULT_COLOR}" &&
-  patch $SOURCE_DIRECTORY/plugins/mp4/mp4.cpp \
-        $SCRIPT_DIRECTORY/mp4v2-1.9.patch
-fi
+message "${MESSAGE_COLOR}Patching for mp4v2...${DEFAULT_COLOR}" &&
+patch $SOURCE_DIRECTORY/plugins/mp4/mp4.cpp \
+      $SCRIPT_DIRECTORY/mp4v2-1.9.patch
diff --git a/audio-libs/mp4v2/CONFLICTS b/audio-libs/mp4v2/CONFLICTS
new file mode 100755
index 0000000..eeb6e8b
--- /dev/null
+++ b/audio-libs/mp4v2/CONFLICTS
@@ -0,0 +1 @@
+conflicts libmp4v2 y
diff --git a/audio-libs/mp4v2/HISTORY b/audio-libs/mp4v2/HISTORY
index 9ff815c..2eec359 100644
--- a/audio-libs/mp4v2/HISTORY
+++ b/audio-libs/mp4v2/HISTORY
@@ -1,4 +1,7 @@
-2010-09-20 Eric Sandall <sandalle at sourcemage.org>
+2010-05-19 Eric Sandall <sandalle at sourcemage.org>
+	* CONFLICTS: Conflict with deprecated libmp4v2
+
+2010-04-20 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS, DEPENDS: Created
 	* PROVIDES: Provides MP4V2
 
diff --git a/audio-libs/mp4v2/PROVIDES b/audio-libs/mp4v2/PROVIDES
deleted file mode 100755
index 5e0d485..0000000
--- a/audio-libs/mp4v2/PROVIDES
+++ /dev/null
@@ -1 +0,0 @@
-provides MP4V2
diff --git a/audio-players/cmus/DEPENDS b/audio-players/cmus/DEPENDS
index 837a3a5..c65310d 100755
--- a/audio-players/cmus/DEPENDS
+++ b/audio-players/cmus/DEPENDS
@@ -33,12 +33,12 @@ optional_depends  "wavpack"              \
                   "CONFIG_WAVPACK=n"     \
                   "for WAVPACK support"  &&
 
-optional_depends  "MP4V2"         \
+optional_depends  "mp4v2"            \
                   "CONFIG_MP4=y"     \
                   "CONFIG_MP4=n"     \
                   "for MP4 support"  &&
 
-if is_depends_enabled $SPELL $(get_spell_provider $SPELL MP4V2)  ;  then
+if is_depends_enabled $SPELL mp4v2;  then
   depends  "faad2"
 fi  &&
 
diff --git a/audio-players/cmus/HISTORY b/audio-players/cmus/HISTORY
index faa819b..db5d3ee 100644
--- a/audio-players/cmus/HISTORY
+++ b/audio-players/cmus/HISTORY
@@ -1,5 +1,6 @@
 2010-05-19 Eric Sandall <sandalle at sourcemage.org>
 	* DEPENDS: Properly depend on faad2 for providers of MP4V2
+	  libmp4v2 deprecated in favour of mp4v2 (Bug #15536)
 
 2010-04-20 Eric Sandall <sandalle at sourcemage.org>
 	* DEPENDS: May use any provider of MP4V2
diff --git a/audio-soft/easytag/DEPENDS b/audio-soft/easytag/DEPENDS
index fb0b768..2f1d0f8 100755
--- a/audio-soft/easytag/DEPENDS
+++ b/audio-soft/easytag/DEPENDS
@@ -28,7 +28,7 @@ optional_depends  faad2                           \
                   "--enable-mp4"                  \
                   ""                              \
                   "Enable Mp4 container support"  &&
-optional_depends  MP4V2                           \
+optional_depends  mp4v2                           \
                   "--enable-mp4"                  \
                   ""                              \
                   "Use libmp4v2 for Mp4 support"  &&
diff --git a/audio-soft/easytag/HISTORY b/audio-soft/easytag/HISTORY
index 0f2acf2..89e3a89 100644
--- a/audio-soft/easytag/HISTORY
+++ b/audio-soft/easytag/HISTORY
@@ -1,5 +1,6 @@
 2010-05-19 Eric Sandall <sandalle at sourcemage.org>
 	* DEPENDS: May use either provider of MP4V2 (Bug #15683)
+	  libmp4v2 deprecated in favour of mp4v2 (Bug #15536)
 	* PRE_BUILD: Apply mp4v2-1.9.patch
 	* mp4v2-1.9.patch: Added from 
 	  http://www.mail-archive.com/arch-commits@archlinux.org/msg14295.html
diff --git a/audio-soft/mediatomb/DEPENDS b/audio-soft/mediatomb/DEPENDS
index 94aa311..65600be 100755
--- a/audio-soft/mediatomb/DEPENDS
+++ b/audio-soft/mediatomb/DEPENDS
@@ -48,7 +48,7 @@ optional_depends LIBAVCODEC \
                  "--enable-ffmpeg" \
                  "--disable-ffmpeg" \
                  "to gather metadata from video files" &&
-optional_depends MP4V2 \
+optional_depends mp4v2 \
                  "" "--disable-libmp4v2" \
                  "to enable MP4 support" &&
 optional_depends liblastfm \
diff --git a/audio-soft/mediatomb/HISTORY b/audio-soft/mediatomb/HISTORY
index ba00254..f0fb75f 100644
--- a/audio-soft/mediatomb/HISTORY
+++ b/audio-soft/mediatomb/HISTORY
@@ -1,3 +1,6 @@
+2010-05-19 Eric Sandall <sandalle at sourcemage.org>
+	* DEPENDS: libmp4v2 deprecated in favour of mp4v2 (Bug #15536)
+
 2010-04-20 Eric Sandall <sandalle at sourcemage.org>
 	* INSTALL: Create mediatomb account/group (Bug #15685)
 	* DEPENDS: May use any provider of MP4V2
diff --git a/kde4-apps/kid3-kde4/DEPENDS b/kde4-apps/kid3-kde4/DEPENDS
index 95b9030..e9210ee 100755
--- a/kde4-apps/kid3-kde4/DEPENDS
+++ b/kde4-apps/kid3-kde4/DEPENDS
@@ -1,7 +1,7 @@
 source  "$SECTION_DIRECTORY/KDE_DEPENDS" &&
 depends  taglib    &&
 depends  id3lib    &&
-depends  MP4V2  &&
+depends  mp4v2     &&
 optional_depends  libvorbis '' '' 'to use Ogg Vorbis' &&
 
 if is_depends_enabled $SPELL libvorbis
diff --git a/kde4-apps/kid3-kde4/HISTORY b/kde4-apps/kid3-kde4/HISTORY
index e3515f2..3f6ba5e 100644
--- a/kde4-apps/kid3-kde4/HISTORY
+++ b/kde4-apps/kid3-kde4/HISTORY
@@ -1,3 +1,6 @@
+2010-05-19 Eric Sandall <sandalle at sourcemage.org>
+	* DEPENDS: libmp4v2 deprecated in favour of mp4v2 (Bug #15536)
+
 2010-04-20 Eric Sandall <sandalle at sourcemage.org>
 	* DEPENDS: May use any provider of MP4V2
 



More information about the SM-Commit mailing list