Index: Makefile
===================================================================
--- Makefile (revision 244)
+++ Makefile (revision 245)
@@ -99,23 +99,23 @@
#
# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
#
-LIBGSF_PKG_NAME = cogl
-LIBGSF_PKG_VERSION = 1.22.8
-LIBGSF_PKG_ARCH = $(PKGARCH)
-LIBGSF_PKG_DISTRO_NAME = $(DISTRO_NAME)
-LIBGSF_PKG_DISTRO_VERSION = $(DISTRO_VERSION)
-LIBGSF_PKG_GROUP = $(PKG_GROUP)
-### |---handy-ruler-------------------------------|
-LIBGSF_PKG_SHORT_DESCRIPTION = 3D graphics rendering library
-LIBGSF_PKG_URL = $(BUG_URL)
-LIBGSF_PKG_LICENSE = SGI
-LIBGSF_PKG_DESCRIPTION_FILE = $(TARGET_BUILD_DIR)/$(LIBGSF_PKG_NAME)-pkg-description
-LIBGSF_PKG_DESCRIPTION_FILE_IN = $(LIBGSF_PKG_NAME)-pkg-description.in
-LIBGSF_PKG_INSTALL_SCRIPT = $(LIBGSF_PKG_NAME)-pkg-install.sh
+COGL_PKG_NAME = cogl
+COGL_PKG_VERSION = 1.22.8
+COGL_PKG_ARCH = $(PKGARCH)
+COGL_PKG_DISTRO_NAME = $(DISTRO_NAME)
+COGL_PKG_DISTRO_VERSION = $(DISTRO_VERSION)
+COGL_PKG_GROUP = $(PKG_GROUP)
+### |---handy-ruler-------------------------------|
+COGL_PKG_SHORT_DESCRIPTION = 3D graphics rendering library
+COGL_PKG_URL = $(BUG_URL)
+COGL_PKG_LICENSE = SGI
+COGL_PKG_DESCRIPTION_FILE = $(TARGET_BUILD_DIR)/$(COGL_PKG_NAME)-pkg-description
+COGL_PKG_DESCRIPTION_FILE_IN = $(COGL_PKG_NAME)-pkg-description.in
+COGL_PKG_INSTALL_SCRIPT = $(COGL_PKG_NAME)-pkg-install.sh
-LIBGSF_PKG = $(CURDIR)/$(TARGET_BUILD_DIR)/$(LIBGSF_PKG_NAME)-package
+COGL_PKG = $(CURDIR)/$(TARGET_BUILD_DIR)/$(COGL_PKG_NAME)-package
-pkg_basename = $(LIBGSF_PKG_NAME)-$(LIBGSF_PKG_VERSION)-$(LIBGSF_PKG_ARCH)-$(LIBGSF_PKG_DISTRO_NAME)-$(LIBGSF_PKG_DISTRO_VERSION)
+pkg_basename = $(COGL_PKG_NAME)-$(COGL_PKG_VERSION)-$(COGL_PKG_ARCH)-$(COGL_PKG_DISTRO_NAME)-$(COGL_PKG_DISTRO_VERSION)
pkg_archive = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
pkg_signature = $(call sign-name,$(pkg_archive))
@@ -133,7 +133,7 @@
include ../../../../build-system/core.mk
-env_sysroot = DESTDIR=$(LIBGSF_PKG)
+env_sysroot = DESTDIR=$(COGL_PKG)
extra_configure_switches = --libdir=/usr/lib$(LIBSUFFIX)
@@ -209,11 +209,11 @@
@touch $@
$(install_target): $(build_target)
- @mkdir -p $(LIBGSF_PKG)
+ @mkdir -p $(COGL_PKG)
@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
# ======= Install Documentation =======
- @if [ -d $(LIBGSF_PKG)/usr/share/man ]; then \
- ( cd $(LIBGSF_PKG)/usr/share/man ; \
+ @if [ -d $(COGL_PKG)/usr/share/man ]; then \
+ ( cd $(COGL_PKG)/usr/share/man ; \
for manpagedir in `find . -type d -name "man*"` ; do \
( cd $$manpagedir ; \
for eachpage in `find . -type l -maxdepth 1` ; do \
@@ -225,26 +225,26 @@
done \
) \
fi
- @mkdir -p $(LIBGSF_PKG)/usr/doc/$(src_dir_name)
+ @mkdir -p $(COGL_PKG)/usr/doc/$(src_dir_name)
@cp -a $(SRC_DIR)/COPYING \
- $(LIBGSF_PKG)/usr/doc/$(src_dir_name)
- @mkdir -p $(LIBGSF_PKG)/usr/share/doc/$(src_dir_name)
+ $(COGL_PKG)/usr/doc/$(src_dir_name)
+ @mkdir -p $(COGL_PKG)/usr/share/doc/$(src_dir_name)
@( cd $(SRC_DIR) ; \
cp -a COPYING README \
- $(LIBGSF_PKG)/usr/share/doc/$(src_dir_name) \
+ $(COGL_PKG)/usr/share/doc/$(src_dir_name) \
)
- @mkdir -p $(LIBGSF_PKG)/usr/share/doc/$(src_dir_name)/html/{cogl,cogl-2.0-experimental,cogl-gst}
+ @mkdir -p $(COGL_PKG)/usr/share/doc/$(src_dir_name)/html/{cogl,cogl-2.0-experimental,cogl-gst}
@( cd $(SRC_DIR)/doc/reference ; \
for dir in cogl cogl-2.0-experimental cogl-gst ; do \
( cd $${dir}/html ; \
cp -a *.html *.png *.css \
- $(LIBGSF_PKG)/usr/share/doc/$(src_dir_name)/html/$${dir} ; \
+ $(COGL_PKG)/usr/share/doc/$(src_dir_name)/html/$${dir} ; \
) ; \
done ; \
)
@( cd $(SRC_DIR) ; \
if [ -r ChangeLog ]; then \
- DOCSDIR=`echo $(LIBGSF_PKG)/usr/share/doc/$(src_dir_name)` ; \
+ DOCSDIR=`echo $(COGL_PKG)/usr/share/doc/$(src_dir_name)` ; \
cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
fi \
@@ -251,22 +251,22 @@
)
@( cd $(SRC_DIR) ; \
if [ -r NEWS ]; then \
- DOCSDIR=`echo $(LIBGSF_PKG)/usr/share/doc/$(src_dir_name)` ; \
+ DOCSDIR=`echo $(COGL_PKG)/usr/share/doc/$(src_dir_name)` ; \
cat NEWS | head -n 1000 > $$DOCSDIR/NEWS ; \
touch -r NEWS $$DOCSDIR/NEWS ; \
fi \
)
# ======= remove toolchain path from target libtool *.la files =======
- @( cd $(LIBGSF_PKG)/usr/lib$(LIBSUFFIX) ; \
+ @( cd $(COGL_PKG)/usr/lib$(LIBSUFFIX) ; \
sed -i "s,$(TARGET_DEST_DIR),,g" libcogl-gles2.la libcogl-gst.la \
libcogl-pango.la libcogl-path.la \
libcogl.la ; \
)
- @( cd $(LIBGSF_PKG)/usr/lib$(LIBSUFFIX)/gstreamer-1.0 ; \
+ @( cd $(COGL_PKG)/usr/lib$(LIBSUFFIX)/gstreamer-1.0 ; \
sed -i "s,$(TARGET_DEST_DIR),,g" libgstcogl.la ; \
)
# ======= Install the same to $(TARGET_DEST_DIR) =======
- $(call install-into-devenv, $(LIBGSF_PKG))
+ $(call install-into-devenv, $(COGL_PKG))
# ======= tune libtool *.la search path to the target destination for development =======
@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX) ; \
sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libcogl-gles2.la libcogl-gst.la \
@@ -290,18 +290,18 @@
cogl-path-1.0.pc cogl-path-2.0-experimental.pc ; \
)
# ======= Strip binaries =======
- @( cd $(LIBGSF_PKG) ; \
+ @( cd $(COGL_PKG) ; \
find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
)
ifeq ($(__ENABLE_STATIC__),yes)
- @( cd $(LIBGSF_PKG) ; \
+ @( cd $(COGL_PKG) ; \
find . | xargs file | grep "current ar archive" | cut -f 1 -d : | xargs $(STRIP) -g 2> /dev/null ; \
)
endif
ifneq ($(PATCHELF),)
# ======= Set RPATH/RUNPATH for target binaries =======
- @( cd $(LIBGSF_PKG)/usr/bin ; \
+ @( cd $(COGL_PKG)/usr/bin ; \
for file in `find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
rpath=`$(PATCHELF) --print-rpath $$file 2> /dev/null` ; \
if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
@@ -310,7 +310,7 @@
done ; \
)
# ======= Set RPATH/RUNPATH for target shared objects =======
- @( cd $(LIBGSF_PKG)/usr/lib$(LIBSUFFIX) ; \
+ @( cd $(COGL_PKG)/usr/lib$(LIBSUFFIX) ; \
for file in `find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
rpath=`$(PATCHELF) --print-rpath $$file 2> /dev/null` ; \
if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
@@ -321,7 +321,7 @@
endif
@touch $@
-$(LIBGSF_PKG_DESCRIPTION_FILE): $(LIBGSF_PKG_DESCRIPTION_FILE_IN)
+$(COGL_PKG_DESCRIPTION_FILE): $(COGL_PKG_DESCRIPTION_FILE_IN)
@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
$(pkg_certificate) : $(pkg_archive) ;
@@ -328,19 +328,19 @@
$(pkg_signature) : $(pkg_archive) ;
$(pkg_description) : $(pkg_archive) ;
-$(pkg_archive): $(install_target) $(LIBGSF_PKG_DESCRIPTION_FILE) $(LIBGSF_PKG_INSTALL_SCRIPT)
- @cp $(LIBGSF_PKG_DESCRIPTION_FILE) $(LIBGSF_PKG)/.DESCRIPTION
- @cp $(LIBGSF_PKG_INSTALL_SCRIPT) $(LIBGSF_PKG)/.INSTALL
- @$(BUILD_PKG_REQUIRES) $(LIBGSF_PKG)/.REQUIRES
- @echo "pkgname=$(LIBGSF_PKG_NAME)" > $(LIBGSF_PKG)/.PKGINFO ; \
- echo "pkgver=$(LIBGSF_PKG_VERSION)" >> $(LIBGSF_PKG)/.PKGINFO ; \
- echo "arch=$(LIBGSF_PKG_ARCH)" >> $(LIBGSF_PKG)/.PKGINFO ; \
- echo "distroname=$(LIBGSF_PKG_DISTRO_NAME)" >> $(LIBGSF_PKG)/.PKGINFO ; \
- echo "distrover=$(LIBGSF_PKG_DISTRO_VERSION)" >> $(LIBGSF_PKG)/.PKGINFO ; \
- echo "group=$(LIBGSF_PKG_GROUP)" >> $(LIBGSF_PKG)/.PKGINFO ; \
- echo "short_description=\"$(LIBGSF_PKG_SHORT_DESCRIPTION)\"" >> $(LIBGSF_PKG)/.PKGINFO ; \
- echo "url=$(LIBGSF_PKG_URL)" >> $(LIBGSF_PKG)/.PKGINFO ; \
- echo "license=$(LIBGSF_PKG_LICENSE)" >> $(LIBGSF_PKG)/.PKGINFO
- @$(PSEUDO) sh -c "cd $(LIBGSF_PKG) && \
+$(pkg_archive): $(install_target) $(COGL_PKG_DESCRIPTION_FILE) $(COGL_PKG_INSTALL_SCRIPT)
+ @cp $(COGL_PKG_DESCRIPTION_FILE) $(COGL_PKG)/.DESCRIPTION
+ @cp $(COGL_PKG_INSTALL_SCRIPT) $(COGL_PKG)/.INSTALL
+ @$(BUILD_PKG_REQUIRES) $(COGL_PKG)/.REQUIRES
+ @echo "pkgname=$(COGL_PKG_NAME)" > $(COGL_PKG)/.PKGINFO ; \
+ echo "pkgver=$(COGL_PKG_VERSION)" >> $(COGL_PKG)/.PKGINFO ; \
+ echo "arch=$(COGL_PKG_ARCH)" >> $(COGL_PKG)/.PKGINFO ; \
+ echo "distroname=$(COGL_PKG_DISTRO_NAME)" >> $(COGL_PKG)/.PKGINFO ; \
+ echo "distrover=$(COGL_PKG_DISTRO_VERSION)" >> $(COGL_PKG)/.PKGINFO ; \
+ echo "group=$(COGL_PKG_GROUP)" >> $(COGL_PKG)/.PKGINFO ; \
+ echo "short_description=\"$(COGL_PKG_SHORT_DESCRIPTION)\"" >> $(COGL_PKG)/.PKGINFO ; \
+ echo "url=$(COGL_PKG_URL)" >> $(COGL_PKG)/.PKGINFO ; \
+ echo "license=$(COGL_PKG_LICENSE)" >> $(COGL_PKG)/.PKGINFO
+ @$(PSEUDO) sh -c "cd $(COGL_PKG) && \
chown -R root:root . && \
$(MAKE_PACKAGE) -J --linkadd=yes $(GNUPG_OPTIONS) -m -d .. ."