pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/multimedia Fix inconsistency (using "#pragma pack()" w...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ae60e0081e96
branches:  trunk
changeset: 536647:ae60e0081e96
user:      tron <tron%pkgsrc.org@localhost>
date:      Tue Dec 18 22:57:43 2007 +0000

description:
Fix inconsistency (using "#pragma pack()" without ever using
"#pragma pack(<n>)". This brings us one step closer to building the
"mplayer" package under Mac OS X Intel.

diffstat:

 multimedia/gmplayer/distinfo              |   3 ++-
 multimedia/mplayer-share/distinfo         |   3 ++-
 multimedia/mplayer-share/patches/patch-ag |  13 +++++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diffs (51 lines):

diff -r 090f499e82ed -r ae60e0081e96 multimedia/gmplayer/distinfo
--- a/multimedia/gmplayer/distinfo      Tue Dec 18 22:24:29 2007 +0000
+++ b/multimedia/gmplayer/distinfo      Tue Dec 18 22:57:43 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.49 2007/09/13 19:16:02 drochner Exp $
+$NetBSD: distinfo,v 1.50 2007/12/18 22:57:43 tron Exp $
 
 SHA1 (gmplayer-1.0rc9-20060123/AlienMind-1.2.tar.bz2) = 34370da1e003e4accceae194a63483aa6eebc4dc
 RMD160 (gmplayer-1.0rc9-20060123/AlienMind-1.2.tar.bz2) = f3fda7d44a59f98097162f76d0a0d58840974998
@@ -70,6 +70,7 @@
 SHA1 (patch-ae) = b725fce8f4dfb7b06f6de388265ce317f22824e9
 SHA1 (patch-af) = c450e4deba228328460b2fef236721e01b9ce112
 SHA1 (patch-ah) = 7aeb9f04d622fcad8c40dc9edbb0a58277fc622b
+SHA1 (patch-ag) = 866fff196714d040af49d049c5c8c640717dc1cf
 SHA1 (patch-ai) = bcf45db81587d99fc69ae5fcf89ff4a4b8f6f53c
 SHA1 (patch-aj) = 40ba1625f85f0264628013ad0209aa095e8e5d3f
 SHA1 (patch-ak) = f095e2824fd54ec7a8ea7a8a59641743c1b65191
diff -r 090f499e82ed -r ae60e0081e96 multimedia/mplayer-share/distinfo
--- a/multimedia/mplayer-share/distinfo Tue Dec 18 22:24:29 2007 +0000
+++ b/multimedia/mplayer-share/distinfo Tue Dec 18 22:57:43 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.42 2007/09/13 19:16:01 drochner Exp $
+$NetBSD: distinfo,v 1.43 2007/12/18 22:57:43 tron Exp $
 
 SHA1 (mplayer-1.0rc9/MPlayer-1.0rc1.tar.bz2) = a450c0b0749c343a8496ba7810363c9d46dfa73c
 RMD160 (mplayer-1.0rc9/MPlayer-1.0rc1.tar.bz2) = 8cea02e832aec5d9e090829d61d0f131dcc177a2
@@ -9,6 +9,7 @@
 SHA1 (patch-ad) = d0b72eaa5e63d2cfd7828ea1a9973f1728c607b5
 SHA1 (patch-ae) = b725fce8f4dfb7b06f6de388265ce317f22824e9
 SHA1 (patch-af) = c450e4deba228328460b2fef236721e01b9ce112
+SHA1 (patch-ag) = 866fff196714d040af49d049c5c8c640717dc1cf
 SHA1 (patch-ah) = 7aeb9f04d622fcad8c40dc9edbb0a58277fc622b
 SHA1 (patch-ai) = bcf45db81587d99fc69ae5fcf89ff4a4b8f6f53c
 SHA1 (patch-aj) = 40ba1625f85f0264628013ad0209aa095e8e5d3f
diff -r 090f499e82ed -r ae60e0081e96 multimedia/mplayer-share/patches/patch-ag
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/mplayer-share/patches/patch-ag Tue Dec 18 22:57:43 2007 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.3 2007/12/18 22:58:53 tron Exp $
+
+--- loader/wine/poppack.h.orig 2006-10-22 23:32:30.000000000 +0100
++++ loader/wine/poppack.h      2007-12-18 22:56:25.000000000 +0000
+@@ -2,7 +2,7 @@
+ #undef __WINE_PSHPACK_H
+ 
+ #if defined(__GNUC__) || defined(__SUNPRO_C)
+-#pragma pack()
++// #pragma pack()
+ #elif defined(__SUNPRO_CC)
+ #warning "Assumes default alignment is 4"
+ #pragma pack(4)



Home | Main Index | Thread Index | Old Index