Cleanup packaging and pkg-config files

  - Move .so file to release pkg
  - Fix incorrect path in pkg-config file

TODO:
  - Provides: libgbm.so should be removed by finding out which pkg requires
              the .so file directly

Change-Id: I66cbaa1efc5265c37c3a95e6d903cd9554d58ad5

diff --git a/Makefile b/Makefile
index a6d6d38fdb502317fa229fed177e960252a857aa..c58d1d50ddf9fdad1d5ec0cc2ca650a4b335345d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,3 @@
-prefix ?= /usr/local
-
 GBM_SO_VER ?= no_ver
 SRC_DIR = ./src
 
@@ -49,7 +47,7 @@ install: all
        cp $(SRC_DIR)/common_drm.h $(prefix)/include/gbm/
        cp $(SRC_DIR)/common.h $(prefix)/include/gbm/
        cp $(SRC_DIR)/gbmint.h $(prefix)/include/gbm/
-       cp pkgconfig/libgbm.pc $(prefix)/lib/pkgconfig/
+       cp pkgconfig/gbm.pc $(prefix)/lib/pkgconfig/
        cp libgbm.so.$(GBM_SO_VER) $(prefix)/lib/
        @for dir in $(GBM_BACKENDS_DIR) ; do \
                $(MAKE) $@ -C $$dir ; \
@@ -61,7 +59,7 @@ uninstall:
        -rm -f $(prefix)/include/gbm/common_drm.h
        -rm -f $(prefix)/include/gbm/common.h
        -rm -f $(prefix)/include/gbm/gbmint.h
-       -rm -f $(prefix)/lib/pkgconfig/libgbm.pc
+       -rm -f $(prefix)/lib/pkgconfig/gbm.pc
        -rm -f $(prefix)/lib/libgbm.so.$(GBM_SO_VER)
        @for dir in $(GBM_BACKENDS_DIR) ; do \
                $(MAKE) $@ -C $$dir ; \

diff --git a/libgbm.manifest b/libgbm.manifest
deleted file mode 100644 (file)
index 97e8c31..0000000
--- a/libgbm.manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest>
-       <request>
-               <domain name="_"/>
-       </request>
-</manifest>

diff --git a/packaging/libgbm.manifest b/packaging/libgbm.manifest
new file mode 100644 (file)
index 0000000..97e8c31
--- /dev/null
+++ b/packaging/libgbm.manifest
@@ -0,0 +1,5 @@
+<manifest>
+       <request>
+               <domain name="_"/>
+       </request>
+</manifest>

diff --git a/packaging/libgbm.spec b/packaging/libgbm.spec
index e2f4fe29cb0e76e3808590e68f1ae50f256c2829..628a849bb086fe1da7a639f3ec61d8fb8a276bf1 100644 (file)
--- a/packaging/libgbm.spec
+++ b/packaging/libgbm.spec
@@ -1,14 +1,12 @@
-Summary:    Wayland Generic Buffer Management for TIZEN
+Summary:    Wayland GBM for TIZEN
 Name:       libgbm
 Version:    1.0.0s
 Release:    1
-Group:      System/X Hardware Support
-License:    Unknown
+Group:      System/Libraries
+License:    MIT
 
 Source0:    %{name}.tar.gz
 
-Provides:   libgbm.so.1.0.0s
-Provides:   libgbm.so.1
 Provides:   libgbm.so
 
 # Requirements
@@ -23,37 +21,44 @@ Wayland Generic Buffer Management for TIZEN
 
 %package devel
 Summary:    Development header files for use with GBM
-Group:      Development/Libraries
+Group:      System/Libraries
 Requires:   %{name}
 
 %description devel
-Development header files for use with gbm
+Development header files for use with Wayland GBM
 
 %prep
 %setup -q -n %{name}
 
 %build
-export GBM_SO_VER=1.0.0s
+export GBM_SO_VER=%{version}
+make clean
 make
 
 %install
 mkdir -p %{buildroot}%{_includedir}
 mkdir -p %{buildroot}%{_libdir}/pkgconfig
-ln -sf libgbm.so.1.0.0s %{buildroot}%{_libdir}/libgbm.so
-ln -sf libgbm.so.1.0.0s %{buildroot}%{_libdir}/libgbm.so.1
+ln -sf libgbm.so.%{version} %{buildroot}%{_libdir}/libgbm.so
+ln -sf libgbm.so.%{version} %{buildroot}%{_libdir}/libgbm.so.1
+ln -sf libgbm.so.%{version} %{buildroot}%{_libdir}/libgbm.so.1.0
 
-export GBM_SO_VER=1.0.0s
+export GBM_SO_VER=%{version}
 %makeinstall
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
 %files
-%manifest libgbm.manifest
+%manifest packaging/libgbm.manifest
 %defattr(-,root,root,-)
-%{_libdir}/libgbm.so.1.0.0s
+%{_libdir}/libgbm.so
 %{_libdir}/libgbm.so.1
+%{_libdir}/libgbm.so.1.0
+%{_libdir}/libgbm.so.%{version}
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/gbm.h
 %{_includedir}/gbm/*
-%{_libdir}/pkgconfig/libgbm.pc
-%{_libdir}/libgbm.so
+%{_libdir}/pkgconfig/gbm.pc

diff --git a/pkgconfig/gbm.pc b/pkgconfig/gbm.pc
new file mode 100644 (file)
index 0000000..9493742
--- /dev/null
+++ b/pkgconfig/gbm.pc
@@ -0,0 +1,12 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: gbm
+Description: Wayland Generic Buffer Management for TIZEN (from Mesa)
+Version: 10.2.0
+Requires.private: libudev >= 151
+Libs: -L${libdir} -lgbm
+Libs.private: -ldl
+Cflags: -I${includedir}

diff --git a/pkgconfig/libgbm.pc b/pkgconfig/libgbm.pc
deleted file mode 100644 (file)
index 271ceed..0000000
--- a/pkgconfig/libgbm.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=/usr/local
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: libgbm
-Description: Mesa GBM library
-Requires.private: libudev >= 151
-Version: 10.2.0-devel
-Libs: -L${libdir} -lgbm
-Libs.private: -ldl
-Cflags: -I${includedir}

diff --git a/src/backend.c b/src/backend.c
index 6da2abb38f537cec0980cbb707e949e1a51e1269..a38b71fe812723dad5b3c3903e2b4be200e7f8bb 100644 (file)
--- a/src/backend.c
+++ b/src/backend.c
@@ -63,7 +63,7 @@ load_backend(const struct backend_desc *backend)
 
    if (backend->builtin) {
       init = backend->builtin;
-   } else { 
+   } else {
       if (name[0] != '/')
          snprintf(path, sizeof path, MODULEDIR "/%s", name);
       else
@@ -122,6 +122,6 @@ _gbm_create_device(int fd)
 
       dev = backend->create_device(fd);
    }
-   
+
    return dev;
 }