head	1.3;
access;
symbols
	RELEASE_7_4_0:1.2
	RELEASE_8_2_0:1.2
	RELEASE_6_EOL:1.1;
locks; strict;
comment	@# @;


1.3
date	2011.04.01.16.45.01;	author rene;	state dead;
branches;
next	1.2;

1.2
date	2010.12.05.20.00.51;	author itetcu;	state Exp;
branches;
next	1.1;

1.1
date	2010.11.13.09.22.45;	author rene;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Update to 10.0.648.204, which is the latest release from the Stable series.

There are still some problems with it on 8.X (and presumably 7.X), see
pkg-message for a possible workaround.

This would not have been possible without:
- portmgr@@ for drawing me into this in October last year
- beat@@ for providing a development repository
- dhw@@ for creating the freebsd-chromium list
- all the patch contributors and testers on the freebsd-chromium list
@
text
@Index: third_party/ffmpeg/ffmpeg.gyp
===================================================================
--- third_party/ffmpeg/ffmpeg.gyp	(revision 49485)
+++ third_party/ffmpeg/ffmpeg.gyp	(working copy)
@@@@ -80,7 +80,7 @@@@
     'ffmpeg_variant%': '<(target_arch)',
 
     'use_system_ffmpeg%': 0,
-    'use_system_yasm%': 0,
+    'use_system_yasm%': 1,
     'build_ffmpegsumo%': 1,
     'use_system_vpx%': 0,
 
@@@@ -156,11 +156,11 @@@@
             'patched-ffmpeg-mt/libavutil/pixdesc.c',
             'patched-ffmpeg-mt/libavutil/rational.c',
             # Config file for the OS and architecture.
-            'config/<(ffmpeg_branding)/<(OS)/<(ffmpeg_config)/config.h',
+            'config/<(ffmpeg_branding)/linux/<(ffmpeg_config)/config.h',
             'config/libavutil/avconfig.h',
           ],
           'include_dirs': [
-            'config/<(ffmpeg_branding)/<(OS)/<(ffmpeg_config)',
+            'config/<(ffmpeg_branding)/linux/<(ffmpeg_config)',
             'patched-ffmpeg-mt',
             'config',
           ],
@@@@ -417,8 +417,13 @@@@
                   }],
                   ['use_system_vpx==0', {
                     'ldflags': [
-                      '-L<(libvpx_hack_dir)/lib/<(OS)/<(target_arch)',
+                      '-L<(libvpx_hack_dir)/lib/linux/<(target_arch)',
                     ],
+                  }, {
+                    # Using libvpx provided by the system.
+                    'ldflags': [
+                      '-L/usr/local/lib',
+                    ],
                   }],
                 ],
               },
@@@@ -476,7 +476,7 @@@@
               }, {
                 # Using libvpx provided by the system.
                 'include_dirs': [
-                  '/usr/include/vpx',
+                  '/usr/local/include',
                 ],
               }
             ],
Index: third_party/ffmpeg/config/Chromium/linux/x64/config.h
===================================================================
--- third_party/ffmpeg/config/Chromium/linux/x64/config.h	(revision 49485)
+++ third_party/ffmpeg/config/Chromium/linux/x64/config.h	(working copy)
@@@@ -45,7 +45,7 @@@@
 #define HAVE_NEON 0
 #define HAVE_PPC4XX 0
 #define HAVE_SSE 1
-#define HAVE_SSSE3 1
+#define HAVE_SSSE3 0
 #define HAVE_VIS 0
 #define HAVE_BIGENDIAN 0
 #define HAVE_BEOSTHREADS 0
@@@@ -94,16 +94,16 @@@@
 #define HAVE_LLRINT 1
 #define HAVE_LOCAL_ALIGNED_16 1
 #define HAVE_LOCAL_ALIGNED_8 1
-#define HAVE_LOG2 1
-#define HAVE_LOG2F 1
+#define HAVE_LOG2 0
+#define HAVE_LOG2F 0
 #define HAVE_LOONGSON 0
 #define HAVE_LRINT 1
 #define HAVE_LRINTF 1
 #define HAVE_LZO1X_999_COMPRESS 0
 #define HAVE_MACHINE_IOCTL_BT848_H 0
 #define HAVE_MACHINE_IOCTL_METEOR_H 0
-#define HAVE_MALLOC_H 1
-#define HAVE_MEMALIGN 1
+#define HAVE_MALLOC_H 0
+#define HAVE_MEMALIGN 0
 #define HAVE_MKSTEMP 1
 #define HAVE_PLD 0
 #define HAVE_POSIX_MEMALIGN 1
Index: third_party/ffmpeg/config/Chromium/linux/ia32/config.h
===================================================================
--- third_party/ffmpeg/config/Chromium/linux/ia32/config.h	(revision 49485)
+++ third_party/ffmpeg/config/Chromium/linux/ia32/config.h	(working copy)
@@@@ -45,7 +45,7 @@@@
 #define HAVE_NEON 0
 #define HAVE_PPC4XX 0
 #define HAVE_SSE 1
-#define HAVE_SSSE3 1
+#define HAVE_SSSE3 0
 #define HAVE_VIS 0
 #define HAVE_BIGENDIAN 0
 #define HAVE_BEOSTHREADS 0
@@@@ -94,16 +94,16 @@@@
 #define HAVE_LLRINT 1
 #define HAVE_LOCAL_ALIGNED_16 1
 #define HAVE_LOCAL_ALIGNED_8 1
-#define HAVE_LOG2 1
-#define HAVE_LOG2F 1
+#define HAVE_LOG2 0
+#define HAVE_LOG2F 0
 #define HAVE_LOONGSON 0
 #define HAVE_LRINT 1
 #define HAVE_LRINTF 1
 #define HAVE_LZO1X_999_COMPRESS 0
 #define HAVE_MACHINE_IOCTL_BT848_H 0
 #define HAVE_MACHINE_IOCTL_METEOR_H 0
-#define HAVE_MALLOC_H 1
-#define HAVE_MEMALIGN 1
+#define HAVE_MALLOC_H 0
+#define HAVE_MEMALIGN 0
 #define HAVE_MKSTEMP 1
 #define HAVE_PLD 0
 #define HAVE_POSIX_MEMALIGN 1
Index: third_party/ffmpeg/config/Chrome/linux/x64/config.h
===================================================================
--- third_party/ffmpeg/config/Chrome/linux/x64/config.h	(revision 49485)
+++ third_party/ffmpeg/config/Chrome/linux/x64/config.h	(working copy)
@@@@ -45,7 +45,7 @@@@
 #define HAVE_NEON 0
 #define HAVE_PPC4XX 0
 #define HAVE_SSE 1
-#define HAVE_SSSE3 1
+#define HAVE_SSSE3 0
 #define HAVE_VIS 0
 #define HAVE_BIGENDIAN 0
 #define HAVE_BEOSTHREADS 0
@@@@ -94,16 +94,16 @@@@
 #define HAVE_LLRINT 1
 #define HAVE_LOCAL_ALIGNED_16 1
 #define HAVE_LOCAL_ALIGNED_8 1
-#define HAVE_LOG2 1
-#define HAVE_LOG2F 1
+#define HAVE_LOG2 0
+#define HAVE_LOG2F 0
 #define HAVE_LOONGSON 0
 #define HAVE_LRINT 1
 #define HAVE_LRINTF 1
 #define HAVE_LZO1X_999_COMPRESS 0
 #define HAVE_MACHINE_IOCTL_BT848_H 0
 #define HAVE_MACHINE_IOCTL_METEOR_H 0
-#define HAVE_MALLOC_H 1
-#define HAVE_MEMALIGN 1
+#define HAVE_MALLOC_H 0
+#define HAVE_MEMALIGN 0
 #define HAVE_MKSTEMP 1
 #define HAVE_PLD 0
 #define HAVE_POSIX_MEMALIGN 1
Index: third_party/ffmpeg/config/Chrome/linux/ia32/config.h
===================================================================
--- third_party/ffmpeg/config/Chrome/linux/ia32/config.h	(revision 49485)
+++ third_party/ffmpeg/config/Chrome/linux/ia32/config.h	(working copy)
@@@@ -45,7 +45,7 @@@@
 #define HAVE_NEON 0
 #define HAVE_PPC4XX 0
 #define HAVE_SSE 1
-#define HAVE_SSSE3 1
+#define HAVE_SSSE3 0
 #define HAVE_VIS 0
 #define HAVE_BIGENDIAN 0
 #define HAVE_BEOSTHREADS 0
@@@@ -94,16 +94,16 @@@@
 #define HAVE_LLRINT 1
 #define HAVE_LOCAL_ALIGNED_16 1
 #define HAVE_LOCAL_ALIGNED_8 1
-#define HAVE_LOG2 1
-#define HAVE_LOG2F 1
+#define HAVE_LOG2 0
+#define HAVE_LOG2F 0
 #define HAVE_LOONGSON 0
 #define HAVE_LRINT 1
 #define HAVE_LRINTF 1
 #define HAVE_LZO1X_999_COMPRESS 0
 #define HAVE_MACHINE_IOCTL_BT848_H 0
 #define HAVE_MACHINE_IOCTL_METEOR_H 0
-#define HAVE_MALLOC_H 1
-#define HAVE_MEMALIGN 1
+#define HAVE_MALLOC_H 0
+#define HAVE_MEMALIGN 0
 #define HAVE_MKSTEMP 1
 #define HAVE_PLD 0
 #define HAVE_POSIX_MEMALIGN 1
@


1.2
log
@Change maintainer.

While concerns have been raised within the ports community about the "pay as
you go" plan of the previous maintainer, given the fact that we have ports for
commercial software this in itself would not warrant such a measure.

However complete and obstinate disregard to the security vulnerabilities of the
version in the ports tree, including refusal to even document them
contradicts the idea of maintainership as the community understands it
and as it is documented.

Rene Ladan - rene@@ has graciously offered his services to work directly
with google/chrome developers, push FreeBSD patches upstream and
generally maintain this port in accordance with our standards.

Approved by:    portmgr@@
@
text
@@


1.1
log
@- Update to 6.0.472.63, again without the Courgette code
- Add option to depend on VP8 codec from ports
- Makefile cleanups
- Tested to work with --integrated-as by maintainer
PR:		ports/152166
Submitted by:	maintainer
@
text
@@

